+ * Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. + *
** The {@link #getManifest() getManifest} method is used to return the @@ -242,7 +246,6 @@ public class JarInputStream extends ZipInputStream { * @param len the maximum number of bytes to read * @return the actual number of bytes read, or -1 if the end of the * entry is reached - * @throws NullPointerException If {@code b} is {@code null}. * @throws IndexOutOfBoundsException If {@code off} is negative, * {@code len} is negative, or {@code len} is greater than * {@code b.length - off} diff --git a/src/java.base/share/classes/java/util/jar/JarOutputStream.java b/src/java.base/share/classes/java/util/jar/JarOutputStream.java index 51883eecb97..63a151d7aed 100644 --- a/src/java.base/share/classes/java/util/jar/JarOutputStream.java +++ b/src/java.base/share/classes/java/util/jar/JarOutputStream.java @@ -35,7 +35,9 @@ import java.io.*; * for writing an optional {@code Manifest} entry. The * {@code Manifest} can be used to specify meta-information about * the JAR file and its entries. - * + *
Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. * @author David Connelly * @see Manifest * @see java.util.zip.ZipOutputStream diff --git a/src/java.base/share/classes/java/util/jar/Manifest.java b/src/java.base/share/classes/java/util/jar/Manifest.java index a46379cb216..b3b9baa38cc 100644 --- a/src/java.base/share/classes/java/util/jar/Manifest.java +++ b/src/java.base/share/classes/java/util/jar/Manifest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,6 +43,9 @@ import sun.security.util.SecurityProperties; * see the * * Manifest format specification. + *
Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. * * @spec jar/jar.html JAR File Specification * @author David Connelly @@ -82,7 +85,8 @@ public class Manifest implements Cloneable { * Constructs a new Manifest from the specified input stream. * * @param is the input stream containing manifest data - * @param jarFilename the name of the corresponding jar archive if available + * @param jarFilename the name of the corresponding jar archive + * if available, else null * @throws IOException if an I/O error has occurred */ Manifest(InputStream is, String jarFilename) throws IOException { @@ -93,7 +97,7 @@ public class Manifest implements Cloneable { * Constructs a new Manifest from the specified input stream * and associates it with a JarVerifier. * - * @param jv the JarVerifier to use + * @param jv the JarVerifier to use if any, else null * @param is the input stream containing manifest data * @param jarFilename the name of the corresponding jar archive if available * @throws IOException if an I/O error has occurred diff --git a/src/java.base/share/classes/java/util/zip/Deflater.java b/src/java.base/share/classes/java/util/zip/Deflater.java index 1938d05418c..6d00a45742b 100644 --- a/src/java.base/share/classes/java/util/zip/Deflater.java +++ b/src/java.base/share/classes/java/util/zip/Deflater.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,6 +44,10 @@ import static java.util.zip.ZipUtils.NIO_ACCESS; * the java.util.zip * package description. *
+ * Unless otherwise noted, passing a {@code null} argument to a method + * in this class will cause a {@link NullPointerException} to be + * thrown. + *
* This class deflates sequences of bytes into ZLIB compressed data format. * The input byte sequence is provided in either byte array or byte buffer, * via one of the {@code setInput()} methods. The output byte sequence is diff --git a/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java b/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java index 84d2c888543..d361af888eb 100644 --- a/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java +++ b/src/java.base/share/classes/java/util/zip/DeflaterInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -164,6 +164,7 @@ public class DeflaterInputStream extends FilterInputStream { * @param len maximum number of compressed bytes to read into {@code b} * @return the actual number of bytes read, or -1 if the end of the * uncompressed input stream is reached + * @throws NullPointerException if {@code b} is null * @throws IndexOutOfBoundsException if {@code len > b.length - off} * @throws IOException if an I/O error occurs or if this input stream is * already closed diff --git a/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java b/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java index 9053c199182..66630d5adf0 100644 --- a/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java +++ b/src/java.base/share/classes/java/util/zip/DeflaterOutputStream.java @@ -34,6 +34,9 @@ import java.io.IOException; * This class implements an output stream filter for compressing data in * the "deflate" compression format. It is also used as the basis for other * types of compression filters, such as GZIPOutputStream. + *
Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. * * @see Deflater * @author David Connelly diff --git a/src/java.base/share/classes/java/util/zip/GZIPInputStream.java b/src/java.base/share/classes/java/util/zip/GZIPInputStream.java index d704fd3c925..5163c5a3b6e 100644 --- a/src/java.base/share/classes/java/util/zip/GZIPInputStream.java +++ b/src/java.base/share/classes/java/util/zip/GZIPInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -70,6 +70,7 @@ public class GZIPInputStream extends InflaterInputStream { * * @throws ZipException if a GZIP format error has occurred or the * compression method used is unsupported + * @throws NullPointerException if {@code in} is null * @throws IOException if an I/O error has occurred * @throws IllegalArgumentException if {@code size <= 0} */ @@ -85,6 +86,7 @@ public class GZIPInputStream extends InflaterInputStream { * * @throws ZipException if a GZIP format error has occurred or the * compression method used is unsupported + * @throws NullPointerException if {@code in} is null * @throws IOException if an I/O error has occurred */ public GZIPInputStream(InputStream in) throws IOException { diff --git a/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java b/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java index cdfac329cfa..d3880c2f4d7 100644 --- a/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java +++ b/src/java.base/share/classes/java/util/zip/GZIPOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,6 +31,10 @@ import java.io.IOException; /** * This class implements a stream filter for writing compressed data in * the GZIP file format. + *
Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. + * * @author David Connelly * @since 1.1 * diff --git a/src/java.base/share/classes/java/util/zip/Inflater.java b/src/java.base/share/classes/java/util/zip/Inflater.java index 115e13e84d7..3c54efc2b2f 100644 --- a/src/java.base/share/classes/java/util/zip/Inflater.java +++ b/src/java.base/share/classes/java/util/zip/Inflater.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,6 +44,10 @@ import static java.util.zip.ZipUtils.NIO_ACCESS; * the java.util.zip * package description. *
+ * Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. + *
* This class inflates sequences of ZLIB compressed bytes. The input byte * sequence is provided in either byte array or byte buffer, via one of the * {@code setInput()} methods. The output byte sequence is written to the diff --git a/src/java.base/share/classes/java/util/zip/InflaterInputStream.java b/src/java.base/share/classes/java/util/zip/InflaterInputStream.java index d60b0447066..08429aab8aa 100644 --- a/src/java.base/share/classes/java/util/zip/InflaterInputStream.java +++ b/src/java.base/share/classes/java/util/zip/InflaterInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,7 +35,9 @@ import java.util.Objects; * This class implements a stream filter for uncompressing data in the * "deflate" compression format. It is also used as the basis for other * decompression filters, such as GZIPInputStream. - * + *
Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. * @see Inflater * @author David Connelly * @since 1.1 @@ -110,7 +112,7 @@ public class InflaterInputStream extends FilterInputStream { usesDefaultInflater = true; } - private byte[] singleByteBuf = new byte[1]; + private final byte[] singleByteBuf = new byte[1]; /** * Reads a byte of uncompressed data. This method will block until @@ -143,7 +145,6 @@ public class InflaterInputStream extends FilterInputStream { * @param len the maximum number of bytes read * @return the actual number of bytes inflated, or -1 if the end of the * compressed input is reached or a preset dictionary is needed - * @throws NullPointerException If {@code b} is {@code null}. * @throws IndexOutOfBoundsException If {@code off} is negative, * {@code len} is negative, or {@code len} is greater than * {@code b.length - off} diff --git a/src/java.base/share/classes/java/util/zip/ZipEntry.java b/src/java.base/share/classes/java/util/zip/ZipEntry.java index b3eb47bce37..7a09836fa83 100644 --- a/src/java.base/share/classes/java/util/zip/ZipEntry.java +++ b/src/java.base/share/classes/java/util/zip/ZipEntry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -222,7 +222,7 @@ public class ZipEntry implements ZipConstants, Cloneable { * * @param time * The last modification time of the entry in local date-time - * + * @throws NullPointerException if {@code time} is null * @see #getTimeLocal() * @since 9 */ diff --git a/src/java.base/share/classes/java/util/zip/ZipInputStream.java b/src/java.base/share/classes/java/util/zip/ZipInputStream.java index e583bc28934..216a914f023 100644 --- a/src/java.base/share/classes/java/util/zip/ZipInputStream.java +++ b/src/java.base/share/classes/java/util/zip/ZipInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,7 +42,9 @@ import static java.util.zip.ZipUtils.*; * An input stream for reading compressed and uncompressed * {@linkplain ZipEntry ZIP file entries} from a stream of bytes in the ZIP file * format. - * + *
Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. *
Unless otherwise noted, passing a {@code null} argument to a constructor + * or method in this class will cause a {@link NullPointerException} to be + * thrown. * @author David Connelly * @since 1.1 */