Merge pull request #19187 from smowton/smowton/feature/jakarta-persistence

Java: generalise `javax.persistence` models to also recognise `jakarta.persistence`.

Author: smowton

java/ql/lib/change-notes/2025-04-01-jakarta-persistence.md

@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* All existing modelling and support for `javax.persistence` now applies to `jakarta.persistence` as well.

java/ql/lib/semmle/code/java/deadcode/DeadField.qll

@@ -161,10 +161,10 @@ class JpaReadField extends ReflectivelyReadField {
       this = entity.getAField() and
       (
         entity.getAccessType() = "field" or
-        this.hasAnnotation("javax.persistence", "Access")
+        this.hasAnnotation(getAPersistencePackageName(), "Access")
       )
     |
-      not this.hasAnnotation("javax.persistence", "Transient") and
+      not this.hasAnnotation(getAPersistencePackageName(), "Transient") and
       not this.isStatic() and
       not this.isFinal()
     )

java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll

@@ -7,6 +7,7 @@ import semmle.code.java.deadcode.StrutsEntryPoints
 import semmle.code.java.deadcode.TestEntryPoints
 import semmle.code.java.deadcode.WebEntryPoints
 import semmle.code.java.frameworks.javaee.JavaServerFaces
+import semmle.code.java.frameworks.javaee.Persistence
 import semmle.code.java.frameworks.JAXB
 import semmle.code.java.frameworks.JaxWS
 import semmle.code.java.JMX
@@ -395,7 +396,7 @@ class PersistencePropertyMethod extends CallableEntryPoint {
       this = e.getACallable() and
       (
         e.getAccessType() = "property" or
-        this.hasAnnotation("javax.persistence", "Access")
+        this.hasAnnotation(getAPersistencePackageName(), "Access")
       ) and
       (
         this.getName().matches("get%") or