Updated to jspecify annotations

Author: phax

ph-css/pom.xml

@@ -163,7 +163,7 @@
           <instructions>
             <Automatic-Module-Name>com.helger.css</Automatic-Module-Name>
             <Export-Package>com.helger.css.*</Export-Package>
-            <Import-Package>!jakarta.annotation.*,*</Import-Package>
+            <Import-Package>!org.jspecify.annotations.*,*</Import-Package>
           </instructions>
         </configuration>
       </plugin>

ph-css/src/main/java/com/helger/css/CSSFilenameHelper.java

@@ -16,14 +16,14 @@
  */
 package com.helger.css;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import com.helger.annotation.concurrent.Immutable;
 import com.helger.annotation.style.PresentForCodeCoverage;
 import com.helger.base.enforce.ValueEnforcer;
 import com.helger.base.string.StringHelper;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 /**
  * Utility methods to deal with CSS filenames.
  *
@@ -84,8 +84,8 @@ public static boolean isRegularCSSFilename (@Nullable final String sFilename)
    *        The filename to get minified. May not be <code>null</code>.
    * @return The minified filename
    */
-  @Nonnull
-  public static String getMinifiedCSSFilename (@Nonnull final String sCSSFilename)
+  @NonNull
+  public static String getMinifiedCSSFilename (@NonNull final String sCSSFilename)
   {
     ValueEnforcer.isTrue (isCSSFilename (sCSSFilename), "Passed file name '" + sCSSFilename + "' is not a CSS file name!");
     if (isMinifiedCSSFilename (sCSSFilename))

ph-css/src/main/java/com/helger/css/CSSSourceArea.java

@@ -16,14 +16,14 @@
  */
 package com.helger.css;
 
+import org.jspecify.annotations.NonNull;
+
 import com.helger.annotation.CheckForSigned;
 import com.helger.annotation.Nonempty;
 import com.helger.annotation.concurrent.Immutable;
 import com.helger.base.hashcode.HashCodeGenerator;
 import com.helger.base.tostring.ToStringGenerator;
 
-import jakarta.annotation.Nonnull;
-
 /**
  * Defines the source location of a single token when reading CSS from a stream.
  * It consists of the start position (getTokenBegin*) and the end position
@@ -107,7 +107,7 @@ public int getTokenEndColumnNumber ()
    *         end are identical, only one line/column value is printed:
    *         <code>(1:2)</code>.
    */
-  @Nonnull
+  @NonNull
   @Nonempty
   public String getTokenLocationAsString ()
   {

ph-css/src/main/java/com/helger/css/CSSSourceLocation.java

@@ -16,6 +16,9 @@
  */
 package com.helger.css;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import com.helger.annotation.CheckForSigned;
 import com.helger.annotation.Nonempty;
 import com.helger.annotation.concurrent.Immutable;
@@ -26,9 +29,6 @@
 import com.helger.base.string.StringHelper;
 import com.helger.base.tostring.ToStringGenerator;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 /**
  * Defines the source location of an object when reading CSS from a stream. It
  * consists of the position of the start token and the position of the end
@@ -197,7 +197,7 @@ public String getLastTokenLocationAsString ()
     return m_aLastTokenArea == null ? null : m_aLastTokenArea.getTokenLocationAsString ();
   }
 
-  @Nonnull
+  @NonNull
   @Nonempty
   public String getLocationAsString ()
   {

ph-css/src/main/java/com/helger/css/ECSSSpecification.java

@@ -16,14 +16,14 @@
  */
 package com.helger.css;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import com.helger.annotation.Nonempty;
 import com.helger.base.id.IHasID;
 import com.helger.base.lang.EnumHelper;
 import com.helger.base.string.StringHelper;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 /**
  * Enumeration containing all W3C CSS specifications.<br>
  * Source: https://www.w3.org/Style/CSS/current-work.en.html<br>
@@ -353,28 +353,28 @@ public enum ECSSSpecification implements IHasID <String>
   private final ECSSSpecificationStatus m_eStatus;
   private final String m_sHandledURL;
 
-  ECSSSpecification (@Nonnull @Nonempty final String sID, @Nonnull final ECSSSpecificationStatus eStatus)
+  ECSSSpecification (@NonNull @Nonempty final String sID, @NonNull final ECSSSpecificationStatus eStatus)
   {
     this (sID, eStatus, null);
   }
 
-  ECSSSpecification (@Nonnull @Nonempty final String sID,
-                     @Nonnull final ECSSSpecificationStatus eStatus,
+  ECSSSpecification (@NonNull @Nonempty final String sID,
+                     @NonNull final ECSSSpecificationStatus eStatus,
                      @Nullable final String sHandledURL)
   {
     m_sID = sID;
     m_eStatus = eStatus;
     m_sHandledURL = sHandledURL;
   }
 
-  @Nonnull
+  @NonNull
   @Nonempty
   public String getID ()
   {
     return m_sID;
   }
 
-  @Nonnull
+  @NonNull
   public ECSSSpecificationStatus getStatus ()
   {
     return m_eStatus;