Updated to JSpecify annotations

Author: phax

jcodemodel/src/main/java/com/helger/jcodemodel/AbstractJAnnotationValue.java

@@ -40,7 +40,7 @@
  */
 package com.helger.jcodemodel;
 
-import jakarta.annotation.Nonnull;
+import org.jspecify.annotations.NonNull;
 
 /**
  * Things that can be values of an annotation element.
@@ -49,76 +49,76 @@
  */
 public abstract class AbstractJAnnotationValue implements IJGenerable
 {
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final boolean bValue)
   {
     return new JAnnotationStringValue (JExpr.lit (bValue), Boolean.valueOf (bValue));
   }
 
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final byte nValue)
   {
     return new JAnnotationStringValue (JExpr.lit (nValue), Byte.valueOf (nValue));
   }
 
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final char cValue)
   {
     return new JAnnotationStringValue (JExpr.lit (cValue), Character.valueOf (cValue));
   }
 
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final double dValue)
   {
     return new JAnnotationStringValue (JExpr.lit (dValue), Double.valueOf (dValue));
   }
 
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final float fValue)
   {
     return new JAnnotationStringValue (JExpr.lit (fValue), Float.valueOf (fValue));
   }
 
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final int nValue)
   {
     return new JAnnotationStringValue (JExpr.lit (nValue), Integer.valueOf (nValue));
   }
 
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final long nValue)
   {
     return new JAnnotationStringValue (JExpr.lit (nValue), Long.valueOf (nValue));
   }
 
-  @Nonnull
+  @NonNull
   public static JAnnotationStringValue wrap (final short nValue)
   {
     return new JAnnotationStringValue (JExpr.lit (nValue), Short.valueOf (nValue));
   }
 
-  @Nonnull
-  public static JAnnotationStringValue wrap (@Nonnull final String sValue)
+  @NonNull
+  public static JAnnotationStringValue wrap (@NonNull final String sValue)
   {
     // Escape string values with quotes so that they can
     // be generated accordingly
     return new JAnnotationStringValue (JExpr.lit (sValue), sValue);
   }
 
-  @Nonnull
-  public static JAnnotationStringValue wrap (@Nonnull final JEnumConstant aValue)
+  @NonNull
+  public static JAnnotationStringValue wrap (@NonNull final JEnumConstant aValue)
   {
     return new JAnnotationStringValue (aValue);
   }
 
-  @Nonnull
-  public static JAnnotationStringValue wrap (@Nonnull final AbstractJType aType)
+  @NonNull
+  public static JAnnotationStringValue wrap (@NonNull final AbstractJType aType)
   {
     return new JAnnotationStringValue (aType.boxify ().dotclass (), aType);
   }
 
-  @Nonnull
-  public static JAnnotationStringValue wrap (@Nonnull final IJExpression aExpr)
+  @NonNull
+  public static JAnnotationStringValue wrap (@NonNull final IJExpression aExpr)
   {
     return new JAnnotationStringValue (aExpr);
   }

jcodemodel/src/main/java/com/helger/jcodemodel/AbstractJAnnotationValueOwned.java

@@ -40,11 +40,11 @@
  */
 package com.helger.jcodemodel;
 
+import org.jspecify.annotations.NonNull;
+
 import com.helger.base.enforce.ValueEnforcer;
 import com.helger.jcodemodel.util.JCNameUtilities;
 
-import jakarta.annotation.Nonnull;
-
 /**
  * Things that can be values of an annotation element and have an owning code
  * model (see {@link IJOwned}).
@@ -57,13 +57,13 @@ protected final class JEnumConstantExpr implements IJExpression
   {
     private final Enum <?> m_aEnumConstant;
 
-    protected JEnumConstantExpr (@Nonnull final Enum <?> aEnumConstant)
+    protected JEnumConstantExpr (@NonNull final Enum <?> aEnumConstant)
     {
       m_aEnumConstant = ValueEnforcer.notNull (aEnumConstant, "EnumConstant");
     }
 
     @Override
-    public void generate (@Nonnull final IJFormatter f)
+    public void generate (@NonNull final IJFormatter f)
     {
       f.type (owner ().ref (m_aEnumConstant.getDeclaringClass ())).print ('.').print (m_aEnumConstant.name ());
     }
@@ -78,26 +78,26 @@ protected static final class FullClassNameExpr implements IJExpression
   {
     private final Class <?> m_aClass;
 
-    protected FullClassNameExpr (@Nonnull final Class <?> aClass)
+    protected FullClassNameExpr (@NonNull final Class <?> aClass)
     {
       m_aClass = ValueEnforcer.notNull (aClass, "Class");
     }
 
     @Override
-    public void generate (@Nonnull final IJFormatter f)
+    public void generate (@NonNull final IJFormatter f)
     {
       f.print (JCNameUtilities.getFullName (m_aClass)).print (".class");
     }
   }
 
-  @Nonnull
-  public AbstractJAnnotationValue wrap (@Nonnull final Enum <?> aEnumConstant)
+  @NonNull
+  public AbstractJAnnotationValue wrap (@NonNull final Enum <?> aEnumConstant)
   {
     return new JAnnotationStringValue (new JEnumConstantExpr (aEnumConstant), aEnumConstant);
   }
 
-  @Nonnull
-  public AbstractJAnnotationValue wrap (@Nonnull final Class <?> aClass)
+  @NonNull
+  public AbstractJAnnotationValue wrap (@NonNull final Class <?> aClass)
   {
     return new JAnnotationStringValue (new FullClassNameExpr (aClass), aClass);
   }