revert to java 25 and fix deprecated annotations

Author: J0nasMayr

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v7
       - uses: aboutbits/github-actions-java/setup-with-maven@v4
         with:
-          java-version: 26
+          java-version: 25
       - name: Test
         env:
           GITHUB_USER_NAME: ${{ github.actor }}

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: aboutbits/github-actions-base/git-setup@v2
       - uses: aboutbits/github-actions-java/setup-with-maven@v4
         with:
-          java-version: 26
+          java-version: 25
       - uses: aboutbits/github-actions-java/set-version-with-maven@v4
         with:
           version: "${{ github.event.inputs.version }}"

.idea/misc.xml

@@ -16,7 +16,7 @@
     <description>Spring Boot Email Service</description>
 
     <properties>
-        <java.version>26</java.version>
+        <java.version>25</java.version>
         <mapstruct.version>1.6.3</mapstruct.version>
     </properties>
 

pom.xml

@@ -1,6 +1,6 @@
 package it.aboutbits.springboot.emailservice.lib;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.time.OffsetDateTime;
 import java.util.List;

src/main/java/it/aboutbits/springboot/emailservice/lib/EmailDto.java

@@ -3,9 +3,8 @@
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Builder;
-import lombok.NonNull;
 import lombok.Singular;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.io.InputStream;
 import java.time.OffsetDateTime;
@@ -14,30 +13,24 @@
 
 @Builder
 public record EmailParameter(
-        @NonNull
         OffsetDateTime scheduledAt,
-        @NonNull
         Email email
 ) {
 
     @Builder
     public record Email(
-            @NonNull
             @NotBlank
             String subject,
 
             @Singular
-            @NonNull
             @NotEmpty
             List<String> recipients,
 
-            @NonNull String textBody,
-            @NonNull String htmlBody,
+            String textBody,
+            String htmlBody,
 
-            @NonNull
             @NotBlank
             String fromAddress,
-            @NonNull
             @NotBlank
             String fromName,
 
@@ -47,17 +40,13 @@ public record Email(
             String replyToName,
 
             @Singular
-            @NonNull
             Set<Attachment> attachments
     ) {
         @Builder
         public record Attachment(
-                @NonNull
                 InputStream payload,
-                @NonNull
                 @NotBlank
                 String fileName,
-                @NonNull
                 @NotBlank
                 String contentType
         ) {

src/main/java/it/aboutbits/springboot/emailservice/lib/application/EmailParameter.java

@@ -11,10 +11,9 @@
 import it.aboutbits.springboot.emailservice.lib.model.EmailAttachment;
 import jakarta.mail.MessagingException;
 import jakarta.validation.Valid;
-import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.ByteArrayResource;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.mail.MailException;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -48,7 +47,7 @@ public ManageEmail(
         this.emailMapper = emailMapper;
     }
 
-    public EmailDto schedule(@NonNull @Valid EmailParameter parameter) throws EmailException {
+    public EmailDto schedule(@Valid EmailParameter parameter) throws EmailException {
         Email email;
         try {
             email = fromParameter(parameter);
@@ -61,7 +60,7 @@ public EmailDto schedule(@NonNull @Valid EmailParameter parameter) throws EmailE
         return emailMapper.toDto(savedEmail);
     }
 
-    public EmailDto sendOrFail(@NonNull @Valid EmailParameter parameter) throws EmailException {
+    public EmailDto sendOrFail(@Valid EmailParameter parameter) throws EmailException {
         Email email;
         try {
             email = fromParameter(parameter);

src/main/java/it/aboutbits/springboot/emailservice/lib/application/ManageEmail.java

@@ -1,6 +1,4 @@
-@NonNullApi
-@NonNullFields
+@NullMarked
 package it.aboutbits.springboot.emailservice.lib.application;
 
-import org.springframework.lang.NonNullApi;
-import org.springframework.lang.NonNullFields;
+import org.jspecify.annotations.NullMarked;

src/main/java/it/aboutbits/springboot/emailservice/lib/application/package-info.java

@@ -3,11 +3,11 @@
 
 import it.aboutbits.springboot.emailservice.lib.EmailState;
 import it.aboutbits.springboot.emailservice.lib.model.Email;
+import org.jspecify.annotations.NonNull;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.lang.NonNull;
 
 import java.util.Collection;
 import java.util.List;

src/main/java/it/aboutbits/springboot/emailservice/lib/jpa/EmailRepository.java

@@ -21,7 +21,7 @@
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.type.SqlTypes;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.time.OffsetDateTime;
 import java.util.List;