From 50d014b912e3ed9f4ff657ba4a3c5a8ac1a9b69f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Feb 2026 15:32:59 +0000 Subject: [PATCH 1/3] Initial plan From 344c59cdf60362daa0e7dd30924889423573f9c0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Feb 2026 15:35:34 +0000 Subject: [PATCH 2/3] Upgrade from jsr305 to jakarta.annotation-api for nullness annotations Co-authored-by: hsluoyz <3787410+hsluoyz@users.noreply.github.com> --- pom.xml | 6 +++--- .../java/org/casbin/casdoor/service/PermissionService.java | 2 +- .../java/org/casbin/casdoor/service/ProviderService.java | 2 +- src/main/java/org/casbin/casdoor/service/RecordService.java | 2 +- src/main/java/org/casbin/casdoor/service/RoleService.java | 2 +- src/main/java/org/casbin/casdoor/service/Service.java | 4 ++-- .../java/org/casbin/casdoor/service/SessionService.java | 2 +- src/main/java/org/casbin/casdoor/util/Map.java | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 90a27f0..f7eee99 100644 --- a/pom.xml +++ b/pom.xml @@ -148,9 +148,9 @@ 2.18.2 - com.google.code.findbugs - jsr305 - 3.0.2 + jakarta.annotation + jakarta.annotation-api + 3.0.0 junit diff --git a/src/main/java/org/casbin/casdoor/service/PermissionService.java b/src/main/java/org/casbin/casdoor/service/PermissionService.java index 1149a9b..7816298 100644 --- a/src/main/java/org/casbin/casdoor/service/PermissionService.java +++ b/src/main/java/org/casbin/casdoor/service/PermissionService.java @@ -21,7 +21,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.PermissionOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/ProviderService.java b/src/main/java/org/casbin/casdoor/service/ProviderService.java index 4b1dbdf..3f7236f 100644 --- a/src/main/java/org/casbin/casdoor/service/ProviderService.java +++ b/src/main/java/org/casbin/casdoor/service/ProviderService.java @@ -20,7 +20,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.ProviderOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/RecordService.java b/src/main/java/org/casbin/casdoor/service/RecordService.java index 495f293..191a0cd 100644 --- a/src/main/java/org/casbin/casdoor/service/RecordService.java +++ b/src/main/java/org/casbin/casdoor/service/RecordService.java @@ -19,7 +19,7 @@ import org.casbin.casdoor.entity.Record; import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/RoleService.java b/src/main/java/org/casbin/casdoor/service/RoleService.java index 1a805bd..c1f0f33 100644 --- a/src/main/java/org/casbin/casdoor/service/RoleService.java +++ b/src/main/java/org/casbin/casdoor/service/RoleService.java @@ -20,7 +20,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.RoleOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/service/Service.java b/src/main/java/org/casbin/casdoor/service/Service.java index 9f90263..dc95bd8 100644 --- a/src/main/java/org/casbin/casdoor/service/Service.java +++ b/src/main/java/org/casbin/casdoor/service/Service.java @@ -9,8 +9,8 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.http.CasdoorResponse; import org.casbin.casdoor.util.http.HttpClient; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.io.File; import java.io.IOException; diff --git a/src/main/java/org/casbin/casdoor/service/SessionService.java b/src/main/java/org/casbin/casdoor/service/SessionService.java index 01f6f96..d30003e 100644 --- a/src/main/java/org/casbin/casdoor/service/SessionService.java +++ b/src/main/java/org/casbin/casdoor/service/SessionService.java @@ -20,7 +20,7 @@ import org.casbin.casdoor.util.Map; import org.casbin.casdoor.util.SessionOperations; import org.casbin.casdoor.util.http.CasdoorResponse; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/casbin/casdoor/util/Map.java b/src/main/java/org/casbin/casdoor/util/Map.java index b1118e4..05979b9 100644 --- a/src/main/java/org/casbin/casdoor/util/Map.java +++ b/src/main/java/org/casbin/casdoor/util/Map.java @@ -1,8 +1,8 @@ package org.casbin.casdoor.util; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.stream.Collectors; From b4ba0dbf28337a714b1261a59566acc169d5b165 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 16 Feb 2026 15:41:46 +0000 Subject: [PATCH 3/3] Use jakarta.annotation-api 2.1.1 for Java 8 compatibility Co-authored-by: hsluoyz <3787410+hsluoyz@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7eee99..6157d56 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ jakarta.annotation jakarta.annotation-api - 3.0.0 + 2.1.1 junit