Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also annotatedfor initialization if it is annotatedfor nullness #92

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* @author Arthur van Hoff
* @since 1.0
*/
@AnnotatedFor({"index", "nullness", "mustcall"})
@AnnotatedFor({"index", "nullness", "initialization", "mustcall"})
public class BufferedInputStream extends FilterInputStream {

private static int DEFAULT_BUFFER_SIZE = 8192;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* @author Arthur van Hoff
* @since 1.0
*/
@AnnotatedFor({"index", "nullness", "mustcall", "signedness"})
@AnnotatedFor({"index", "nullness", "initialization", "mustcall", "signedness"})
public class BufferedOutputStream extends FilterOutputStream {
/**
* The internal buffer where data is stored.
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/BufferedReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
* @since 1.1
*/

@AnnotatedFor({"index", "lock", "mustcall", "nullness"})
@AnnotatedFor({"index", "lock", "mustcall", "nullness", "initialization",})
public class BufferedReader extends Reader {

private Reader in;
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/BufferedWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
* @since 1.1
*/

@AnnotatedFor({"index", "mustcall", "nullness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization"})
public class BufferedWriter extends Writer {

private Writer out;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
* @see java.io.StringBufferInputStream
* @since 1.0
*/
@AnnotatedFor({"index", "mustcall", "nullness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization"})
@InheritableMustCall({})
public class ByteArrayInputStream extends InputStream {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* @since 1.0
*/

@AnnotatedFor({"index", "lock", "mustcall", "nullness", "signedness"})
@AnnotatedFor({"index", "lock", "mustcall", "nullness", "initialization", "signedness"})
@InheritableMustCall({})
public class ByteArrayOutputStream extends OutputStream {

Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/CharArrayReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @author Herb Jellinek
* @since 1.1
*/
@AnnotatedFor({"index", "mustcall", "nullness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization"})
@InheritableMustCall({})
public class CharArrayReader extends Reader {
/** The character buffer. */
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/CharArrayWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
* @author Herb Jellinek
* @since 1.1
*/
@AnnotatedFor({"index", "lock", "mustcall", "nullness"})
@AnnotatedFor({"index", "lock", "mustcall", "nullness", "initialization"})
@InheritableMustCall({})
public class CharArrayWriter extends Writer {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/Closeable.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
*
* @since 1.5
*/
@AnnotatedFor({"lock", "mustcall", "nullness"})
@AnnotatedFor({"lock", "mustcall", "nullness", "initialization"})
@InheritableMustCall("close")
public interface Closeable extends AutoCloseable {

Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/Console.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
* @since 1.6
*/

@AnnotatedFor({"formatter", "index", "interning", "nullness"})
@AnnotatedFor({"formatter", "index", "interning", "nullness", "initialization"})
public final @UsesObjectEquals class Console implements Flushable
{
/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/DataInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
* @see java.io.DataOutput
* @since 1.0
*/
@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public interface DataInput {
/**
* Reads some bytes from an input
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/DataInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* @see java.io.DataOutputStream
* @since 1.0
*/
@AnnotatedFor({"index", "mustcall", "nullness", "signedness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization", "signedness"})
public class DataInputStream extends FilterInputStream implements DataInput {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/DataOutput.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
* @see java.io.DataOutputStream
* @since 1.0
*/
@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public interface DataOutput {
/**
* Writes to the output stream the eight
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/DataOutputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* @see java.io.DataInputStream
* @since 1.0
*/
@AnnotatedFor({"index", "lock", "mustcall", "nullness", "signedness"})
@AnnotatedFor({"index", "lock", "mustcall", "nullness", "initialization", "signedness"})
public class DataOutputStream extends FilterOutputStream implements DataOutput {
/**
* The number of bytes written to the data output stream so far.
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/Externalizable.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
* @see java.io.Serializable
* @since 1.1
*/
@AnnotatedFor({"nullness"})
@AnnotatedFor({"nullness", "initialization"})
public interface Externalizable extends java.io.Serializable {
/**
* The object implements the writeExternal method to save its contents
Expand Down
4 changes: 3 additions & 1 deletion src/java.base/share/classes/java/io/File.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
import java.net.URISyntaxException;
import java.nio.file.FileStore;
import java.nio.file.FileSystems;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.attribute.FileAttribute;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -160,7 +162,7 @@
"return null in the case of an IO error (instead of throwing IOException).",
"EnsuresNonNullIf(expression={\"list()\",\"list(FilenameFilter)\",\"listFiles()\",\"listFiles(FilenameFilter)\",\"listFiles(FileFilter)\"}, result=true)\""
})
@AnnotatedFor({"index", "interning", "lock", "nullness"})
@AnnotatedFor({"index", "interning", "lock", "nullness", "initialization"})
public class File
implements Serializable, Comparable<File>
{
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FileDescriptor.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* @author Pavani Diwanji
* @since 1.0
*/
@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public final class FileDescriptor {

private int fd;
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FileFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*
* @since 1.2
*/
@AnnotatedFor({"nullness"})
@AnnotatedFor({"nullness", "initialization"})
@FunctionalInterface
public interface FileFilter {

Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FileInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* @see java.nio.file.Files#newInputStream
* @since 1.0
*/
@AnnotatedFor({"index", "mustcall", "nullness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization",})
public class FileInputStream extends InputStream
{
private static final int DEFAULT_BUFFER_SIZE = 8192;
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FileOutputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
* @see java.nio.file.Files#newOutputStream
* @since 1.0
*/
@AnnotatedFor({"index", "mustcall", "nullness", "signedness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization", "signedness"})
public class FileOutputStream extends OutputStream
{
/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FilePermission.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
* @serial exclude
*/

@AnnotatedFor({"lock", "nullness", "index"})
@AnnotatedFor({"lock", "nullness", "initialization", "index"})
public final class FilePermission extends Permission implements Serializable {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FileReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* @author Mark Reinhold
* @since 1.1
*/
@AnnotatedFor({"nullness"})
@AnnotatedFor({"nullness", "initialization"})
public class FileReader extends InputStreamReader {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FileWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* @since 1.1
*/

@AnnotatedFor({"nullness"})
@AnnotatedFor({"nullness", "initialization"})
public class FileWriter extends OutputStreamWriter {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FilenameFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* @see java.io.File#list(java.io.FilenameFilter)
* @since 1.0
*/
@AnnotatedFor({"nullness"})
@AnnotatedFor({"nullness", "initialization"})
@FunctionalInterface
public interface FilenameFilter {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FilterInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
* @author Jonathan Payne
* @since 1.0
*/
@AnnotatedFor({"index", "mustcall", "nullness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization"})
public class FilterInputStream extends InputStream {
/**
* The input stream to be filtered.
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FilterReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* @since 1.1
*/

@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public abstract class FilterReader extends Reader {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/FilterWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @since 1.1
*/

@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public abstract class FilterWriter extends Writer {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/Flushable.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*
* @since 1.5
*/
@AnnotatedFor({"nullness"})
@AnnotatedFor({"nullness", "initialization"})
public interface Flushable {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/IOException.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* @see java.io.OutputStream
* @since 1.0
*/
@AnnotatedFor({"nullness"})
@AnnotatedFor({"nullness", "initialization"})
public class IOException extends Exception {
@java.io.Serial
static final long serialVersionUID = 7818375828146090155L;
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/InputStreamReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
* @since 1.1
*/

@AnnotatedFor({"index", "mustcall", "nullness"})
@AnnotatedFor({"index", "mustcall", "nullness", "initialization"})
public class InputStreamReader extends Reader {

private final StreamDecoder sd;
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/LineNumberReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
* @since 1.1
*/

@AnnotatedFor({"index", "lock", "mustcall", "nullness"})
@AnnotatedFor({"index", "lock", "mustcall", "nullness", "initialization"})
public class LineNumberReader extends BufferedReader {

/** Previous character types */
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/ObjectInput.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @see java.io.ObjectInputStream
* @since 1.1
*/
@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public interface ObjectInput extends DataInput, AutoCloseable {
/**
* Read and return an object. The class that implements this interface
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/ObjectOutput.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* @see java.io.ObjectInputStream
* @since 1.1
*/
@AnnotatedFor({"nullness", "index", "signedness"})
@AnnotatedFor({"nullness", "initialization", "index", "signedness"})
public interface ObjectOutput extends DataOutput, AutoCloseable {
/**
* Write an object to the underlying storage or stream. The
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/ObjectStreamField.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* @see ObjectStreamClass
* @since 1.2
*/
@AnnotatedFor({"interning", "lock", "nullness"})
@AnnotatedFor({"interning", "lock", "nullness", "initialization"})
public @UsesObjectEquals class ObjectStreamField
implements Comparable<Object>
{
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/OutputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* @see java.io.OutputStream#write(int)
* @since 1.0
*/
@AnnotatedFor({"index", "interning", "nullness", "signedness"})
@AnnotatedFor({"index", "interning", "nullness", "initialization", "signedness"})
public abstract @UsesObjectEquals class OutputStream implements Closeable, Flushable {
/**
* Constructor for subclasses to call.
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/PipedOutputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* @see java.io.PipedInputStream
* @since 1.0
*/
@AnnotatedFor({"nullness", "index", "signedness"})
@AnnotatedFor({"nullness", "initialization", "index", "signedness"})
public class PipedOutputStream extends OutputStream {

/* REMIND: identification of the read and write sides needs to be
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/PipedReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* @since 1.1
*/

@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public class PipedReader extends Reader {
boolean closedByWriter = false;
boolean closedByReader = false;
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/PipedWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* @since 1.1
*/

@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public class PipedWriter extends Writer {

/* REMIND: identification of the read and write sides needs to be
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/PrintStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
*/

@CFComment({"lock: TODO: Should parameters be @GuardSatisfied, or is the default of @GuardedBy({}) appropriate? (@GuardedBy({}) is more conservative.)"})
@AnnotatedFor({"formatter", "i18n", "index", "lock", "mustcall", "nullness", "signedness"})
@AnnotatedFor({"formatter", "i18n", "index", "lock", "mustcall", "nullness", "initialization", "signedness"})
public class PrintStream extends FilterOutputStream
implements Appendable, Closeable
{
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/PrintWriter.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
* @since 1.1
*/

@AnnotatedFor({"formatter", "index", "lock", "mustcall", "nullness"})
@AnnotatedFor({"formatter", "index", "lock", "mustcall", "nullness", "initialization"})
public class PrintWriter extends Writer {

/**
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/PushbackReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @since 1.1
*/

@AnnotatedFor({"nullness", "index"})
@AnnotatedFor({"nullness", "initialization", "index"})
public class PushbackReader extends FilterReader {

/** Pushback buffer */
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/RandomAccessFile.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
* @since 1.0
*/

@AnnotatedFor({"index", "interning", "mustcall", "nullness", "signedness"})
@AnnotatedFor({"index", "interning", "mustcall", "nullness", "initialization", "signedness"})
public @UsesObjectEquals class RandomAccessFile implements DataOutput, DataInput, Closeable {

private FileDescriptor fd;
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/classes/java/io/Reader.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
* @since 1.1
*/

@AnnotatedFor({"index", "interning", "lock", "nullness"})
@AnnotatedFor({"index", "interning", "lock", "nullness", "initialization"})
public abstract @UsesObjectEquals class Reader implements Readable, Closeable {

private static final int TRANSFER_BUFFER_SIZE = 8192;
Expand Down
Loading
Loading