Skip to content

Commit 66c6a39

Browse files
authored
Add @DefaultFor and @AnnotatedFor to package-info in java.base. (openjdk#6)
There is no java package in Java 11, so remove package-info that was added.
1 parent e5a65b7 commit 66c6a39

File tree

10 files changed

+56
-6
lines changed

10 files changed

+56
-6
lines changed

src/java.base/share/classes/java/io/package-info.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@
4646
*
4747
* @since 1.0
4848
*/
49+
@AnnotatedFor("nullness")
50+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
4951
package java.io;
52+
import org.checkerframework.framework.qual.DefaultQualifier;
53+
import org.checkerframework.framework.qual.TypeUseLocation;
54+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
55+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/lang/package-info.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,10 @@
6868
*
6969
* @since 1.0
7070
*/
71+
@AnnotatedFor("nullness")
72+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
7173
package java.lang;
74+
import org.checkerframework.framework.qual.DefaultQualifier;
75+
import org.checkerframework.framework.qual.TypeUseLocation;
76+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
77+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/math/package-info.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,10 @@
4242
*
4343
* @since 1.1
4444
*/
45+
@AnnotatedFor("nullness")
46+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
4547
package java.math;
48+
import org.checkerframework.framework.qual.DefaultQualifier;
49+
import org.checkerframework.framework.qual.TypeUseLocation;
50+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
51+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/net/package-info.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,10 @@
157157
*
158158
* @since 1.0
159159
*/
160+
@AnnotatedFor("nullness")
161+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
160162
package java.net;
163+
import org.checkerframework.framework.qual.DefaultQualifier;
164+
import org.checkerframework.framework.qual.TypeUseLocation;
165+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
166+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/nio/package-info.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,10 @@
152152
* @author Mark Reinhold
153153
* @author JSR-51 Expert Group
154154
*/
155+
@AnnotatedFor("nullness")
156+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
155157
package java.nio;
158+
import org.checkerframework.framework.qual.DefaultQualifier;
159+
import org.checkerframework.framework.qual.TypeUseLocation;
160+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
161+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/package-info.java

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/java.base/share/classes/java/security/package-info.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,10 @@
8181
*
8282
* @since 1.1
8383
*/
84+
@AnnotatedFor("nullness")
85+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
8486
package java.security;
87+
import org.checkerframework.framework.qual.DefaultQualifier;
88+
import org.checkerframework.framework.qual.TypeUseLocation;
89+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
90+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/text/package-info.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,11 @@
4444
*
4545
* @since 1.1
4646
*/
47+
@AnnotatedFor("nullness")
48+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
4749
package java.text;
50+
51+
import org.checkerframework.framework.qual.DefaultQualifier;
52+
import org.checkerframework.framework.qual.TypeUseLocation;
53+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
54+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/time/package-info.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,4 +285,11 @@
285285
*
286286
* @since 1.8
287287
*/
288+
@AnnotatedFor("nullness")
289+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
288290
package java.time;
291+
292+
import org.checkerframework.framework.qual.DefaultQualifier;
293+
import org.checkerframework.framework.qual.TypeUseLocation;
294+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
295+
import org.checkerframework.framework.qual.AnnotatedFor;

src/java.base/share/classes/java/util/package-info.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@
4646
*
4747
* @since 1.0
4848
*/
49+
@AnnotatedFor("nullness")
50+
@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
4951
package java.util;
52+
import org.checkerframework.framework.qual.DefaultQualifier;
53+
import org.checkerframework.framework.qual.TypeUseLocation;
54+
import org.checkerframework.checker.nullness.qual.KeyForBottom;
55+
import org.checkerframework.framework.qual.AnnotatedFor;

0 commit comments

Comments
 (0)