Updated to jspecify annotations

Author: phax

phase2-demo-webapp/src/main/java/com/helger/phase2/webapp/module/ConfigurableAS2MDNServletReceiverModule.java

@@ -16,11 +16,11 @@
  */
 package com.helger.phase2.webapp.module;
 
+import org.jspecify.annotations.NonNull;
+
 import com.helger.phase2.processor.receiver.net.AS2MDNReceiverHandler;
 import com.helger.phase2.servlet.util.AS2ServletMDNReceiverModule;
 
-import jakarta.annotation.Nonnull;
-
 /**
  * Configurable version of {@link AS2ServletMDNReceiverModule}.
  *
@@ -29,7 +29,7 @@
 public class ConfigurableAS2MDNServletReceiverModule extends AS2ServletMDNReceiverModule
 {
   @Override
-  @Nonnull
+  @NonNull
   public AS2MDNReceiverHandler createHandler ()
   {
     final AS2MDNReceiverHandler ret = super.createHandler ();

phase2-demo-webapp/src/main/java/com/helger/phase2/webapp/module/ConfigurableAS2ServletReceiverModule.java

@@ -16,11 +16,11 @@
  */
 package com.helger.phase2.webapp.module;
 
+import org.jspecify.annotations.NonNull;
+
 import com.helger.phase2.processor.receiver.net.AS2ReceiverHandler;
 import com.helger.phase2.servlet.util.AS2ServletReceiverModule;
 
-import jakarta.annotation.Nonnull;
-
 /**
  * Configurable version of {@link AS2ServletReceiverModule}.
  *
@@ -29,7 +29,7 @@
 public class ConfigurableAS2ServletReceiverModule extends AS2ServletReceiverModule
 {
   @Override
-  @Nonnull
+  @NonNull
   public AS2ReceiverHandler createHandler ()
   {
     final AS2ReceiverHandler ret = super.createHandler ();

phase2-demo-webapp/src/main/java/com/helger/phase2/webapp/servlet/AS2WebAppListener.java

@@ -16,9 +16,10 @@
  */
 package com.helger.phase2.webapp.servlet;
 
+import org.jspecify.annotations.NonNull;
+
 import com.helger.web.scope.mgr.WebScopeManager;
 
-import jakarta.annotation.Nonnull;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletContextEvent;
 import jakarta.servlet.ServletContextListener;
@@ -39,13 +40,13 @@ public class AS2WebAppListener implements ServletContextListener
    * @param aSC
    *        The servlet context. May not be <code>null</code>.
    */
-  public static void staticInit (@Nonnull final ServletContext aSC)
+  public static void staticInit (@NonNull final ServletContext aSC)
   {
     com.helger.phase2.servlet.AS2WebAppListener.staticInit (aSC);
     GlobalAS2Session.ensureClassIsLoaded ();
   }
 
-  public void contextInitialized (@Nonnull final ServletContextEvent aSCE)
+  public void contextInitialized (@NonNull final ServletContextEvent aSCE)
   {
     final ServletContext aSC = aSCE.getServletContext ();
     staticInit (aSC);
@@ -60,7 +61,7 @@ public static void staticDestroy ()
     WebScopeManager.onGlobalEnd ();
   }
 
-  public void contextDestroyed (@Nonnull final ServletContextEvent aSce)
+  public void contextDestroyed (@NonNull final ServletContextEvent aSce)
   {
     staticDestroy ();
   }

phase2-lib/pom.xml

@@ -152,7 +152,7 @@
               com.helger.phase2.util.http,
               com.helger.phase2.util.javamail
             </Export-Package>
-            <Import-Package>!jakarta.annotation.*,*</Import-Package>
+            <Import-Package>!org.jspecify.annotations.*,*</Import-Package>
             <Include-Resource>{maven-resources},phase2-version.properties=target/classes/phase2-version.properties</Include-Resource>
           </instructions>
         </configuration>

phase2-lib/src/main/java/com/helger/phase2/AbstractDynamicComponent.java

@@ -32,6 +32,9 @@
  */
 package com.helger.phase2;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import com.helger.annotation.OverridingMethodsMustInvokeSuper;
 import com.helger.annotation.concurrent.GuardedBy;
 import com.helger.annotation.style.ReturnsMutableObject;
@@ -45,9 +48,6 @@
 import com.helger.typeconvert.collection.IStringMap;
 import com.helger.typeconvert.collection.StringMap;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 /**
  * Abstract implementation of {@link IDynamicComponent}.
  *
@@ -60,7 +60,7 @@ public abstract class AbstractDynamicComponent implements IDynamicComponent
   private final StringMap m_aAttrs = new StringMap ();
   private IAS2Session m_aSession;
 
-  @Nonnull
+  @NonNull
   @ReturnsMutableObject
   public final StringMap attrs ()
   {
@@ -73,24 +73,24 @@ public String getName ()
     return ClassHelper.getClassLocalName (this);
   }
 
-  @Nonnull
-  public final String getAttributeAsStringRequired (@Nonnull final String sKey) throws AS2InvalidParameterException
+  @NonNull
+  public final String getAttributeAsStringRequired (@NonNull final String sKey) throws AS2InvalidParameterException
   {
     final String sValue = m_aRWLock.readLockedGet ( () -> attrs ().getAsString (sKey));
     if (sValue == null)
       throw new AS2InvalidParameterException ("Parameter not found", this, sKey, null);
     return sValue;
   }
 
-  public final int getAttributeAsIntRequired (@Nonnull final String sKey) throws AS2InvalidParameterException
+  public final int getAttributeAsIntRequired (@NonNull final String sKey) throws AS2InvalidParameterException
   {
     final int nValue = m_aRWLock.readLockedInt ( () -> attrs ().getAsInt (sKey, Integer.MIN_VALUE));
     if (nValue == Integer.MIN_VALUE)
       throw new AS2InvalidParameterException ("Parameter not found", this, sKey, null);
     return nValue;
   }
 
-  @Nonnull
+  @NonNull
   public final IAS2Session getSession ()
   {
     if (m_aSession == null)
@@ -99,7 +99,7 @@ public final IAS2Session getSession ()
   }
 
   @OverridingMethodsMustInvokeSuper
-  public void initDynamicComponent (@Nonnull final IAS2Session aSession, @Nullable final IStringMap aParameters)
+  public void initDynamicComponent (@NonNull final IAS2Session aSession, @Nullable final IStringMap aParameters)
                                                                                                                  throws AS2Exception
   {
     m_aSession = ValueEnforcer.notNull (aSession, "Session");

phase2-lib/src/main/java/com/helger/phase2/IDynamicComponent.java

@@ -32,14 +32,14 @@
  */
 package com.helger.phase2;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import com.helger.phase2.exception.AS2Exception;
 import com.helger.phase2.params.AS2InvalidParameterException;
 import com.helger.phase2.session.IAS2Session;
 import com.helger.typeconvert.collection.IStringMap;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 /**
  * The Component interface provides a standard way to dynamically create and initialize an object.
  * Component-based objects also have access to a Session, which allow each component to access all
@@ -57,7 +57,7 @@ public interface IDynamicComponent
   /**
    * @return The attributes of this component.
    */
-  @Nonnull
+  @NonNull
   IStringMap attrs ();
 
   /**
@@ -76,7 +76,7 @@ public interface IDynamicComponent
    *
    * @return this component's session. Never <code>null</code>.
    */
-  @Nonnull
+  @NonNull
   IAS2Session getSession ();
 
   /**
@@ -95,5 +95,5 @@ public interface IDynamicComponent
    *         If a required parameter is null in the parameters Map
    * @see IAS2Session
    */
-  void initDynamicComponent (@Nonnull IAS2Session aSession, @Nullable IStringMap aParameters) throws AS2Exception;
+  void initDynamicComponent (@NonNull IAS2Session aSession, @Nullable IStringMap aParameters) throws AS2Exception;
 }

phase2-lib/src/main/java/com/helger/phase2/cert/AS2CertificateNotFoundException.java

@@ -34,19 +34,19 @@
 
 import java.security.cert.X509Certificate;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import com.helger.phase2.exception.AS2Exception;
 import com.helger.phase2.partner.Partnership;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 public class AS2CertificateNotFoundException extends AS2Exception
 {
   private final ECertificatePartnershipType m_ePartnershipType;
   private final String m_sAlias;
 
   public AS2CertificateNotFoundException (@Nullable final ECertificatePartnershipType ePartnershipType,
-                                          @Nonnull final Partnership aPartnership)
+                                          @NonNull final Partnership aPartnership)
   {
     super ("Type " + ePartnershipType + ": no alias found for partnership " + aPartnership);
     m_ePartnershipType = ePartnershipType;

phase2-lib/src/main/java/com/helger/phase2/cert/AS2KeyNotFoundException.java

@@ -34,22 +34,22 @@
 
 import java.security.cert.X509Certificate;
 
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+
 import com.helger.collection.commons.ICommonsList;
 import com.helger.phase2.exception.AS2Exception;
 
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-
 /**
  * AS2 exception to be thrown if a private key is not found
  *
  * @author Philip Helger
  */
 public class AS2KeyNotFoundException extends AS2Exception
 {
-  public AS2KeyNotFoundException (@Nonnull final X509Certificate aCert,
+  public AS2KeyNotFoundException (@NonNull final X509Certificate aCert,
                                   @Nullable final String sAlias,
-                                  @Nonnull final ICommonsList <String> aAllAliases,
+                                  @NonNull final ICommonsList <String> aAllAliases,
                                   @Nullable final Throwable aCause)
   {
     super ("Alias '" + sAlias + "' for Certificate '" + aCert + "'. All contained aliases are: " + aAllAliases, aCause);