Revert files to OpenJDK head if they lack JSpecify annotations.

Author: cpovirk

src/java.base/share/classes/java/io/DeleteOnExitHook.java

@@ -24,9 +24,6 @@
  */
 package java.io;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.util.*;
 
 import jdk.internal.access.SharedSecrets;
@@ -37,8 +34,7 @@
  * quick removal.
  */
 
-@AnnotatedFor({"interning"})
-@UsesObjectEquals class DeleteOnExitHook {
+class DeleteOnExitHook {
     private static LinkedHashSet<String> files = new LinkedHashSet<>();
     static {
         // DeleteOnExitHook must be the last shutdown hook to be invoked.

src/java.base/share/classes/java/io/FileSystem.java

@@ -25,18 +25,13 @@
 
 package java.io;
 
-import org.checkerframework.checker.index.qual.IndexOrHigh;
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.lang.annotation.Native;
 
 /**
  * Package-private abstract class for the local filesystem abstraction.
  */
 
-@AnnotatedFor({"index", "interning"})
-abstract @UsesObjectEquals class FileSystem {
+abstract class FileSystem {
 
     /* -- Normalization and construction -- */
 
@@ -60,7 +55,7 @@
      * Compute the length of this pathname string's prefix.  The pathname
      * string must be in normal form.
      */
-    public abstract @IndexOrHigh({"#1"}) int prefixLength(String path);
+    public abstract int prefixLength(String path);
 
     /**
      * Resolve the child pathname string against the parent.

src/java.base/share/classes/java/io/SerialCallbackContext.java

@@ -25,9 +25,6 @@
 
 package java.io;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 /**
  * Context during upcalls from object stream to class-defined
  * readObject/writeObject methods.
@@ -39,8 +36,7 @@
  * readObject/writeObject method has returned.
  * If not set to the current thread, the getObj method throws NotActiveException.
  */
-@AnnotatedFor({"interning"})
-final @UsesObjectEquals class SerialCallbackContext {
+final class SerialCallbackContext {
     private final Object obj;
     private final ObjectStreamClass desc;
     /**

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

@@ -51,8 +51,4 @@
  * @spec serialization/index.html Java Object Serialization Specification
  * @since 1.0
  */
-@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
 package java.io;
-import  org.checkerframework.framework.qual.DefaultQualifier;
-import  org.checkerframework.framework.qual.TypeUseLocation;
-import  org.checkerframework.checker.nullness.qual.KeyForBottom;

src/java.base/share/classes/java/lang/ApplicationShutdownHooks.java

@@ -24,9 +24,6 @@
  */
 package java.lang;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.util.*;
 import java.util.concurrent.RejectedExecutionException;
 
@@ -38,8 +35,7 @@
  * @see java.lang.Runtime#removeShutdownHook
  */
 
-@AnnotatedFor({"interning"})
-@UsesObjectEquals class ApplicationShutdownHooks {
+class ApplicationShutdownHooks {
     /* The set of registered hooks */
     private static IdentityHashMap<Thread, Thread> hooks;
     static {

src/java.base/share/classes/java/lang/AutoCloseable.java

@@ -25,9 +25,6 @@
 
 package java.lang;
 
-import org.checkerframework.checker.lock.qual.GuardSatisfied;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 /**
  * An object that may hold resources (such as file or socket handles)
  * until it is closed. The {@link #close()} method of an {@code AutoCloseable}
@@ -51,7 +48,6 @@
  * @author Josh Bloch
  * @since 1.7
  */
-@AnnotatedFor({"lock"})
 public interface AutoCloseable {
     /**
      * Closes this resource, relinquishing any underlying resources.
@@ -99,5 +95,5 @@ public interface AutoCloseable {
      *
      * @throws Exception if this resource cannot be closed
      */
-    void close(@GuardSatisfied AutoCloseable this) throws Exception;
+    void close() throws Exception;
 }

src/java.base/share/classes/java/lang/CharacterData.java

@@ -25,12 +25,7 @@
 
 package java.lang;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.common.value.qual.IntRange;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
-@AnnotatedFor({"index", "interning"})
-abstract @UsesObjectEquals class CharacterData {
+abstract class CharacterData {
     abstract int getProperties(int ch);
     abstract int getType(int ch);
     abstract boolean isDigit(int ch);
@@ -52,7 +47,7 @@
     abstract int toLowerCase(int ch);
     abstract int toUpperCase(int ch);
     abstract int toTitleCase(int ch);
-    abstract int digit(int ch, @IntRange(from = 2, to = 36) int radix);
+    abstract int digit(int ch, int radix);
     abstract int getNumericValue(int ch);
     abstract byte getDirectionality(int ch);
 

src/java.base/share/classes/java/lang/ClassValue.java

@@ -25,9 +25,6 @@
 
 package java.lang;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.util.WeakHashMap;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -47,8 +44,7 @@
  * @author John Rose, JSR 292 EG
  * @since 1.7
  */
-@AnnotatedFor({"interning"})
-public abstract @UsesObjectEquals class ClassValue<T> {
+public abstract class ClassValue<T> {
     /**
      * Sole constructor.  (For invocation by subclass constructors, typically
      * implicit.)

src/java.base/share/classes/java/lang/ConditionalSpecialCasing.java

@@ -25,9 +25,6 @@
 
 package java.lang;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.text.BreakIterator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -47,8 +44,7 @@
  * Note that the unconditional case mappings (including 1:M mappings)
  * are handled in {@code Character.toLower/UpperCase()}.
  */
-@AnnotatedFor({"interning"})
-final @UsesObjectEquals class ConditionalSpecialCasing {
+final class ConditionalSpecialCasing {
 
     // context conditions.
     static final int FINAL_CASED =              1;

src/java.base/share/classes/java/lang/invoke/InvokeDynamic.java

@@ -25,13 +25,9 @@
 
 package java.lang.invoke;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 /**
  * This is a place-holder class.  Some HotSpot implementations need to see it.
  */
-@AnnotatedFor({"interning"})
-final @UsesObjectEquals class InvokeDynamic {
+final class InvokeDynamic {
     private InvokeDynamic() { throw new InternalError(); }  // do not instantiate
 }

src/java.base/share/classes/java/lang/invoke/SwitchPoint.java

@@ -25,9 +25,6 @@
 
 package java.lang.invoke;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 /**
  * <p>
  * A {@code SwitchPoint} is an object which can publish state transitions to other threads.
@@ -113,8 +110,7 @@
  * @author Remi Forax, JSR 292 EG
  * @since 1.7
  */
-@AnnotatedFor({"interning"})
-public @UsesObjectEquals class SwitchPoint {
+public class SwitchPoint {
     private static final MethodHandle
         K_true  = MethodHandles.constant(boolean.class, true),
         K_false = MethodHandles.constant(boolean.class, false);

src/java.base/share/classes/java/lang/reflect/WildcardType.java

@@ -24,7 +24,6 @@
  */
 
 package java.lang.reflect;
-import org.checkerframework.common.value.qual.MinLen;
 
 /**
  * WildcardType represents a wildcard type expression, such as
@@ -59,7 +58,7 @@ public interface WildcardType extends Type {
      *     bounds refer to a parameterized type that cannot be instantiated
      *     for any reason
      */
-    Type @MinLen(1) [] getUpperBounds();
+    Type[] getUpperBounds();
 
     /**
      * Returns an array of {@code Type} objects representing the

src/java.base/share/classes/java/math/BitSieve.java

@@ -25,9 +25,6 @@
 
 package java.math;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 /**
  * A simple bit sieve used for finding prime number candidates. Allows setting
  * and clearing of bits in a storage array. The size of the sieve is assumed to
@@ -47,8 +44,7 @@
  * @author  Michael McCloskey
  * @since   1.3
  */
-@AnnotatedFor({"interning"})
-@UsesObjectEquals class BitSieve {
+class BitSieve {
     /**
      * Stores the bits in this bitSieve.
      */

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

@@ -42,8 +42,4 @@
  *
  * @since 1.1
  */
-@DefaultQualifier(value = KeyForBottom.class, locations = TypeUseLocation.LOWER_BOUND)
 package java.math;
-import  org.checkerframework.framework.qual.DefaultQualifier;
-import  org.checkerframework.framework.qual.TypeUseLocation;
-import  org.checkerframework.checker.nullness.qual.KeyForBottom;

src/java.base/share/classes/java/net/CacheRequest.java

@@ -25,9 +25,6 @@
 
 package java.net;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.io.OutputStream;
 import java.io.IOException;
 
@@ -44,8 +41,7 @@
  * @author Yingxian Wang
  * @since 1.5
  */
-@AnnotatedFor({"interning"})
-public abstract @UsesObjectEquals class CacheRequest {
+public abstract class CacheRequest {
 
     /**
      * Constructor for subclasses to call.

src/java.base/share/classes/java/net/CacheResponse.java

@@ -25,9 +25,6 @@
 
 package java.net;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.io.InputStream;
 import java.util.Map;
 import java.util.List;
@@ -42,8 +39,7 @@
  * @author Yingxian Wang
  * @since 1.5
  */
-@AnnotatedFor({"interning"})
-public abstract @UsesObjectEquals class CacheResponse {
+public abstract class CacheResponse {
 
     /**
      * Constructor for subclasses to call.

src/java.base/share/classes/java/net/ContentHandler.java

@@ -25,9 +25,6 @@
 
 package java.net;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.io.IOException;
 
 /**
@@ -80,8 +77,7 @@
  * @see     java.net.URLConnection#setContentHandlerFactory(java.net.ContentHandlerFactory)
  * @since   1.0
  */
-@AnnotatedFor({"interning"})
-public abstract @UsesObjectEquals class ContentHandler {
+public abstract class ContentHandler {
 
     /**
      * Constructor for subclasses to call.

src/java.base/share/classes/java/net/CookieHandler.java

@@ -25,9 +25,6 @@
 
 package java.net;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.util.Map;
 import java.util.List;
 import java.io.IOException;
@@ -52,8 +49,7 @@
  * @author Yingxian Wang
  * @since 1.5
  */
-@AnnotatedFor({"interning"})
-public abstract @UsesObjectEquals class CookieHandler {
+public abstract class CookieHandler {
     /**
      * Constructor for subclasses to call.
      */

src/java.base/share/classes/java/net/DatagramSocketImpl.java

@@ -25,9 +25,6 @@
 
 package java.net;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -41,8 +38,7 @@
  * @since  1.1
  */
 
-@AnnotatedFor({"interning"})
-public abstract @UsesObjectEquals class DatagramSocketImpl implements SocketOptions {
+public abstract class DatagramSocketImpl implements SocketOptions {
 
     /**
      * Constructor for subclasses to call.

src/java.base/share/classes/java/net/IDN.java

@@ -24,9 +24,6 @@
  */
 package java.net;
 
-import org.checkerframework.checker.interning.qual.UsesObjectEquals;
-import org.checkerframework.framework.qual.AnnotatedFor;
-
 import java.io.InputStream;
 import java.io.IOException;
 
@@ -90,8 +87,7 @@
  * @since 1.6
  *
  */
-@AnnotatedFor({"interning"})
-public final @UsesObjectEquals class IDN {
+public final class IDN {
     /**
      * Flag to allow processing of unassigned code points
      */