Revert files to OpenJDK head if they lack user-visible types.

jspecify · Dec 9, 2024 · 300a39f · 300a39f
1 parent 2941b2e
commit 300a39f
Show file tree

Hide file tree

Showing 38 changed files with 38 additions and 189 deletions.
diff --git a/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java b/src/java.base/share/classes/java/lang/AssertionStatusDirectives.java
@@ -25,9 +25,6 @@
 
 package java.lang;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
-
 /**
  * A collection of assertion status directives (such as "enable assertions
  * in package p" or "disable assertions in class c").  This class is used by
@@ -38,7 +35,6 @@
  * @since  1.4
  * @author Josh Bloch
  */
-@NullMarked
 class AssertionStatusDirectives {
     /**
      * The classes for which assertions are to be enabled or disabled.

diff --git a/src/java.base/share/classes/java/lang/Shutdown.java b/src/java.base/share/classes/java/lang/Shutdown.java
@@ -25,8 +25,6 @@
 
 package java.lang;
 
-import org.jspecify.annotations.NullMarked;
-import org.jspecify.annotations.Nullable;
 
 import jdk.internal.misc.VM;
 
@@ -42,8 +40,7 @@
  * @see java.io.DeleteOnExitHook
  */
 
-@NullMarked
- class Shutdown {
+class Shutdown {
 
     // The system shutdown hooks are registered with a predefined slot.
     // The list of shutdown hooks is as follows:
@@ -52,7 +49,7 @@ class Shutdown {
     //     shutdown hooks and waits until they finish
     // (2) DeleteOnExit hook
     private static final int MAX_SYSTEM_HOOKS = 10;
-    private static final @Nullable Runnable[] hooks = new Runnable[MAX_SYSTEM_HOOKS];
+    private static final Runnable[] hooks = new Runnable[MAX_SYSTEM_HOOKS];
 
     // the index of the currently running shutdown hook to the hooks array
     private static int currentRunningHook = -1;

diff --git a/src/java.base/share/classes/java/text/DigitList.java b/src/java.base/share/classes/java/text/DigitList.java
@@ -38,8 +38,6 @@
 
 package java.text;
 
-import org.jspecify.annotations.Nullable;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
@@ -690,9 +688,7 @@ final void set(boolean isNegative, BigInteger source, int maximumDigits) {
     /**
      * equality test between two digit lists.
      */
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj)                      // quick check
             return true;
         if (!(obj instanceof DigitList other))         // (1) same object?

diff --git a/src/java.base/share/classes/java/text/PatternEntry.java b/src/java.base/share/classes/java/text/PatternEntry.java
@@ -38,8 +38,6 @@
 
 package java.text;
 
-import org.jspecify.annotations.Nullable;
-
 import java.lang.Character;
 
 /**
@@ -70,9 +68,7 @@ private void appendQuotedChars(StringBuilder toAddTo) {
      * Because Vector.indexOf doesn't take a comparator,
      * this method is ill-defined and ignores strength.
      */
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj == null) return false;
         PatternEntry other = (PatternEntry) obj;
         boolean result = chars.equals(other.chars);

diff --git a/src/java.base/share/classes/java/text/RuleBasedCollationKey.java b/src/java.base/share/classes/java/text/RuleBasedCollationKey.java
@@ -38,8 +38,6 @@
 
 package java.text;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * A RuleBasedCollationKey is a concrete implementation of CollationKey class.
  * The RuleBasedCollationKey class is used by the RuleBasedCollator class.
@@ -74,9 +72,7 @@ else if (result >= Collator.GREATER)
      * @param target the RuleBasedCollationKey to compare to.
      * @return Returns true if two objects are equal, false otherwise.
      */
-
-
-    public boolean equals(@Nullable Object target) {
+    public boolean equals(Object target) {
         if (this == target) return true;
         if (target == null || !getClass().equals(target.getClass())) {
             return false;

diff --git a/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoLocalDateTimeImpl.java
@@ -61,8 +61,6 @@
  */
 package java.time.chrono;
 
-import org.jspecify.annotations.Nullable;
-
 import static java.time.temporal.ChronoField.EPOCH_DAY;
 
 import java.io.IOException;
@@ -435,9 +433,7 @@ static ChronoLocalDateTime<?> readExternal(ObjectInput in) throws IOException, C
 
     //-----------------------------------------------------------------------
     @Override
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }

diff --git a/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoPeriodImpl.java
@@ -56,8 +56,6 @@
  */
 package java.time.chrono;
 
-import org.jspecify.annotations.Nullable;
-
 import static java.time.temporal.ChronoField.MONTH_OF_YEAR;
 import static java.time.temporal.ChronoUnit.DAYS;
 import static java.time.temporal.ChronoUnit.MONTHS;
@@ -317,9 +315,7 @@ private void validateChrono(TemporalAccessor temporal) {
 
     //-----------------------------------------------------------------------
     @Override
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }

diff --git a/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java b/src/java.base/share/classes/java/time/chrono/ChronoZonedDateTimeImpl.java
@@ -61,8 +61,6 @@
  */
 package java.time.chrono;
 
-import org.jspecify.annotations.Nullable;
-
 import static java.time.temporal.ChronoUnit.SECONDS;
 
 import java.io.IOException;
@@ -367,9 +365,7 @@ static ChronoZonedDateTime<?> readExternal(ObjectInput in) throws IOException, C
 
     //-------------------------------------------------------------------------
     @Override
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }

diff --git a/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java b/src/java.base/share/classes/java/util/JapaneseImperialCalendar.java
@@ -25,8 +25,6 @@
 
 package java.util;
 
-import org.jspecify.annotations.Nullable;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import sun.util.locale.provider.CalendarDataUtility;
@@ -383,9 +381,7 @@ public String getCalendarType() {
      * @see Calendar#compareTo(Calendar)
      */
     @Override
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         return obj instanceof JapaneseImperialCalendar &&
             super.equals(obj);
     }

diff --git a/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java b/src/java.base/unix/classes/sun/nio/fs/UnixFileKey.java
@@ -25,8 +25,6 @@
 
 package sun.nio.fs;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * Container for device/inode to uniquely identify file.
  */
@@ -47,9 +45,7 @@ public int hashCode() {
     }
 
     @Override
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj == this)
             return true;
         return obj instanceof UnixFileKey other

diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/MimeTypeParameterList.java
@@ -25,8 +25,6 @@
 
 package java.awt.datatransfer;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -76,9 +74,7 @@ public int hashCode() {
      * set of parameter names and associated values. The order of the parameters
      * is not considered.
      */
-
-
-    public boolean equals(@Nullable Object thatObject) {
+    public boolean equals(Object thatObject) {
         //System.out.println("MimeTypeParameterList.equals("+this+","+thatObject+")");
         if (!(thatObject instanceof MimeTypeParameterList)) {
             return false;

diff --git a/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java b/src/java.desktop/share/classes/com/sun/beans/WildcardTypeImpl.java
@@ -24,8 +24,6 @@
  */
 package com.sun.beans;
 
-import org.jspecify.annotations.Nullable;
-
 import java.lang.reflect.Type;
 import java.lang.reflect.WildcardType;
 import java.util.Arrays;
@@ -104,9 +102,7 @@ public Type[] getLowerBounds() {
      * @see sun.reflect.generics.reflectiveObjects.WildcardTypeImpl#equals
      */
     @Override
-
-
-    public boolean equals(@Nullable Object object) {
+    public boolean equals(Object object) {
         if (object instanceof WildcardType) {
             WildcardType type = (WildcardType) object;
             return Arrays.equals(this.upperBounds, type.getUpperBounds())

diff --git a/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java b/src/java.desktop/share/classes/com/sun/beans/finder/Signature.java
@@ -24,8 +24,6 @@
  */
 package com.sun.beans.finder;
 
-import org.jspecify.annotations.Nullable;
-
 /**
  * This class is designed to be a key of a cache
  * of constructors or methods.
@@ -85,9 +83,7 @@ Class<?>[] getArgs() {
      * @see #hashCode()
      */
     @Override
-
-
-    public boolean equals(@Nullable Object object) {
+    public boolean equals(Object object) {
         if (this == object) {
             return true;
         }

diff --git a/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java b/src/java.desktop/share/classes/javax/swing/plaf/nimbus/DerivedColor.java
@@ -24,8 +24,6 @@
  */
 package javax.swing.plaf.nimbus;
 
-import org.jspecify.annotations.Nullable;
-
 import javax.swing.UIManager;
 import java.awt.Color;
 import java.beans.PropertyChangeSupport;
@@ -115,9 +113,7 @@ public void rederiveColor() {
     }
 
     @Override
-
-
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof DerivedColor)) return false;
         DerivedColor that = (DerivedColor) o;

diff --git a/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java b/src/java.desktop/share/classes/sun/awt/im/InputMethodLocator.java
@@ -25,8 +25,6 @@
 
 package sun.awt.im;
 
-import org.jspecify.annotations.Nullable;
-
 import java.awt.AWTException;
 import java.awt.im.spi.InputMethodDescriptor;
 import java.util.Locale;
@@ -56,9 +54,7 @@ final class InputMethodLocator {
         this.locale = locale;
     }
 
-
-
-    public boolean equals(@Nullable Object other) {
+    public boolean equals(Object other) {
         if (other == this) {
             return true;
         }

diff --git a/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java b/src/java.desktop/unix/classes/sun/awt/X11/WindowDimensions.java
@@ -24,8 +24,6 @@
  */
 package sun.awt.X11;
 
-import org.jspecify.annotations.Nullable;
-
 import java.awt.*;
 
 class WindowDimensions {
@@ -166,9 +164,7 @@ public String toString() {
         return "[" + loc + ", " + size + "(" +(isClientSizeSet?"client":"bounds") + ")+" + insets + "]";
     }
 
-
-
-    public boolean equals(@Nullable Object o) {
+    public boolean equals(Object o) {
         if (!(o instanceof WindowDimensions)) {
             return false;
         }

diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java b/src/java.naming/share/classes/com/sun/jndi/ldap/ClientId.java
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.ldap;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Locale;
 import java.util.Arrays; // JDK 1.2
 import java.io.OutputStream;
@@ -117,9 +115,7 @@ class ClientId {
             + (ctlHash=hashCodeControls(bindCtls));
     }
 
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (!(obj instanceof ClientId)) {
             return false;
         }

diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java b/src/java.naming/share/classes/com/sun/jndi/ldap/DigestClientId.java
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.ldap;
 
-import org.jspecify.annotations.Nullable;
-
 import java.util.Arrays; // JDK 1.2
 import java.util.Hashtable;
 
@@ -84,9 +82,7 @@ class DigestClientId extends SimpleClientId {
         myHash = super.hashCode() ^ Arrays.hashCode(propvals);
     }
 
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (!(obj instanceof DigestClientId)) {
             return false;
         }

diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java b/src/java.naming/share/classes/com/sun/jndi/ldap/NotifierArgs.java
@@ -25,8 +25,6 @@
 
 package com.sun.jndi.ldap;
 
-import org.jspecify.annotations.Nullable;
-
 import javax.naming.directory.SearchControls;
 import javax.naming.event.*;
 
@@ -80,9 +78,7 @@ final class NotifierArgs {
     }
 
     // checks name, filter, controls
-
-
-    public boolean equals(@Nullable Object obj) {
+    public boolean equals(Object obj) {
         if (obj instanceof NotifierArgs) {
             NotifierArgs target = (NotifierArgs)obj;
             return mask == target.mask &&