Merge ~vpa1977/ubuntu/+source/lombok:java21-patches into ubuntu/+source/lombok:ubuntu/devel

[Vladimir Petko]

This MR adds Java 21 support patch from upstream.

Changes:
 - cherry-pick upstream Java 21 support patch.

PPA: ppa:vpa1977/plusone[1]

Testing:
 - rebuild dependant packages:
   * byte-buddy [2]
   * ddogleg [3]
   * ivyplusplus [4]
   * jcabi-log [5]
   * libejml-java [6]
   * lombok-ast [7]
   * lombok-patcher [8]
   * snakeyaml [9]
 - piuparts [10]
 -

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone/+packages
[2] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827490/+listing-archive-extra
[3] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827492/+listing-archive-extra
[4] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827493/+listing-archive-extra
[5] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827494/+listing-archive-extra
[6] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827495/+listing-archive-extra
[7] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827497/+listing-archive-extra
[8] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827498/+listing-archive-extra
[9] https://launchpad.net/~vpa1977/+archive/ubuntu/plusone-rebuild/+sourcepub/15827499/+listing-archive-extra
[10] https://bugs.launchpad.net/ubuntu/+source/lombok/+bug/2054736/comments/1

[Zixing Liu (liushuyu-011)]

Looks good to me.
The added patch conforms to DEP-3.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 3536689..48c5428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lombok (1.18.24-2ubuntu1) noble; urgency=medium
+
+  * d/p/java21-support.patch: add upstream patch that fixes Java 21
+    compatibility issues (LP: #2054736).
+
+ -- Vladimir Petko <[e-mail]>  Thu, 22 Feb 2024 12:04:45 +1300
+
 lombok (1.18.24-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index 53267f3..08d57f8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: lombok
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders:
  Jakub Adam <[e-mail]>,
  Komal Sukhani <[e-mail]>
diff --git a/debian/patches/java21-support.patch b/debian/patches/java21-support.patch
new file mode 100644
index 0000000..c576d9f
--- /dev/null
+++ b/debian/patches/java21-support.patch
@@ -0,0 +1,160 @@
+Description: Add support for JDK21
+ This fixes issue with java.lang.NoSuchFieldError, case guard conditions and
+ enabling annotation processing in javac.
+Author: Rawi01 <[e-mail]>, Reinier Zwitserloot <[e-mail]>
+Origin: upstream, https://github.com/projectlombok/lombok/commit/f6ca064d752a85ca799978b1afc87510c5e220f1
+Bug: https://github.com/projectlombok/lombok/pull/3473
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057538
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lombok/+bug/2054736
+Applied-Upstream: commit, f6ca064d752a85ca799978b1afc87510c5e220f1
+Last-Update: 2024-02-22
+--- a/src/core/lombok/javac/JavacImportList.java
++++ b/src/core/lombok/javac/JavacImportList.java
+@@ -50,7 +50,7 @@
+ 	@Override public String getFullyQualifiedNameForSimpleNameNoAliasing(String unqualified) {
+ 		for (JCTree def : defs) {
+ 			if (!(def instanceof JCImport)) continue;
+-			JCTree qual = ((JCImport) def).qualid;
++			JCTree qual = Javac.getQualid((JCImport) def);
+ 			if (!(qual instanceof JCFieldAccess)) continue;
+ 			String simpleName = ((JCFieldAccess) qual).name.toString();
+ 			if (simpleName.equals(unqualified)) {
+@@ -68,7 +68,7 @@
+ 		for (JCTree def : defs) {
+ 			if (!(def instanceof JCImport)) continue;
+ 			if (((JCImport) def).staticImport) continue;
+-			JCTree qual = ((JCImport) def).qualid;
++			JCTree qual = Javac.getQualid((JCImport) def);
+ 			if (!(qual instanceof JCFieldAccess)) continue;
+ 			String simpleName = ((JCFieldAccess) qual).name.toString();
+ 			if (!"*".equals(simpleName)) continue;
+@@ -87,7 +87,7 @@
+ 		for (JCTree def : defs) {
+ 			if (!(def instanceof JCImport)) continue;
+ 			if (((JCImport) def).staticImport) continue;
+-			JCTree qual = ((JCImport) def).qualid;
++			JCTree qual = Javac.getQualid((JCImport) def);
+ 			if (!(qual instanceof JCFieldAccess)) continue;
+ 			String simpleName = ((JCFieldAccess) qual).name.toString();
+ 			if (!"*".equals(simpleName)) continue;
+--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
++++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+@@ -546,7 +546,7 @@
+ 			if (!(def instanceof JCImport)) continue;
+ 			JCImport imp0rt = (JCImport) def;
+ 			if (imp0rt.staticImport) continue;
+-			if (!imp0rt.qualid.toString().equals(name)) continue;
++			if (!Javac.getQualid(imp0rt).toString().equals(name)) continue;
+ 			JavacAugments.JCImport_deletable.set(imp0rt, true);
+ 		}
+ 	}
+--- a/src/delombok/lombok/delombok/Delombok.java
++++ b/src/delombok/lombok/delombok/Delombok.java
+@@ -714,6 +714,7 @@
+ 			}
+ 			
+ 			if (!disablePreview && Javac.getJavaCompilerVersion() >= 11) argsList.add("--enable-preview");
++			if (Javac.getJavaCompilerVersion() >= 21) argsList.add("-proc:full");
+ 			
+ 			if (Javac.getJavaCompilerVersion() < 15) {
+ 				String[] argv = argsList.toArray(new String[0]);
+--- a/src/delombok/lombok/delombok/PrettyPrinter.java
++++ b/src/delombok/lombok/delombok/PrettyPrinter.java
+@@ -93,6 +93,7 @@
+ import com.sun.tools.javac.util.Position;
+ 
+ import lombok.javac.CommentInfo;
++import lombok.javac.Javac;
+ import lombok.javac.PackageName;
+ import lombok.permit.Permit;
+ import lombok.javac.CommentInfo.EndConnection;
+@@ -486,8 +487,9 @@
+ 	}
+ 	
+ 	@Override public void visitImport(JCImport tree) {
+-		if (tree.qualid instanceof JCFieldAccess) {
+-			JCFieldAccess fa = ((JCFieldAccess) tree.qualid);
++		JCTree qualid = Javac.getQualid(tree);
++		if (qualid instanceof JCFieldAccess) {
++			JCFieldAccess fa = ((JCFieldAccess) qualid);
+ 			if (fa.name.length() == 1 && fa.name.contentEquals("*")) {
+ 				if (fa.selected instanceof JCFieldAccess) {
+ 					JCFieldAccess lombokExperimental = (JCFieldAccess) fa.selected;
+@@ -501,7 +503,7 @@
+ 		
+ 		aPrint("import ");
+ 		if (tree.staticImport) print("static ");
+-		print(tree.qualid);
++		print(qualid);
+ 		println(";", tree);
+ 	}
+ 	
+@@ -1347,6 +1349,12 @@
+ 		} else {
+ 			aPrint("case ");
+ 			print(pats, ", ");
++
++			JCExpression guard = readObject(tree, "guard", null); // JDK 21+
++			if (guard != null) {
++				print(" when ");
++				print(guard);
++			}
+ 		}
+ 		
+ 		Enum<?> caseKind = readObject(tree, "caseKind", null); // JDK 12+
+--- a/src/utils/lombok/javac/Javac.java
++++ b/src/utils/lombok/javac/Javac.java
+@@ -51,6 +51,7 @@
+ import com.sun.tools.javac.tree.JCTree.JCExpression;
+ import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
+ import com.sun.tools.javac.tree.JCTree.JCIdent;
++import com.sun.tools.javac.tree.JCTree.JCImport;
+ import com.sun.tools.javac.tree.JCTree.JCLiteral;
+ import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
+ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
+@@ -400,6 +401,19 @@
+ 			throw sneakyThrow(e.getCause());
+ 		}
+ 	}
++
++	/**
++	 * In some versions, the field's type is {@code JCTree}, in others it is {@code JCFieldAccess}, which at the JVM level are not the same.
++	 */
++	private static final Field JCIMPORT_QUALID = Permit.permissiveGetField(JCImport.class, "qualid");
++
++	public static JCTree getQualid(JCImport tree) {
++		try {
++			return (JCTree) JCIMPORT_QUALID.get(tree);
++		} catch (IllegalAccessException e) {
++			throw sneakyThrow(e.getCause());
++		}
++	}
+ 
+ 	private static final Class<?> JC_VOID_TYPE, JC_NO_TYPE;
+ 	
+--- a/src/utils/lombok/javac/JavacTreeMaker.java
++++ b/src/utils/lombok/javac/JavacTreeMaker.java
+@@ -589,9 +589,10 @@
+ 	//javac versions: 6-11
+ 	private static final MethodId<JCCase> Case11 = MethodId("Case", JCCase.class, JCExpression.class, com.sun.tools.javac.util.List.class);
+ 	//javac version: 12+
+-	public static class Case12 {
++	public static class Case {
+ 		private static final Class<?> CASE_KIND_CLASS = classForName(TreeMaker.class, "com.sun.source.tree.CaseTree$CaseKind");
+ 		static final MethodId<JCCase> Case12 = MethodId("Case", JCCase.class, CASE_KIND_CLASS, com.sun.tools.javac.util.List.class, com.sun.tools.javac.util.List.class, JCTree.class);
++		static final MethodId<JCCase> Case21 = MethodId("Case", JCCase.class, CASE_KIND_CLASS, com.sun.tools.javac.util.List.class, JCExpression.class, com.sun.tools.javac.util.List.class, JCTree.class);
+ 		static final Object CASE_KIND_STATEMENT = CASE_KIND_CLASS.getEnumConstants()[0];
+ 	}
+ 	
+@@ -613,7 +614,10 @@
+ 		} else {
+ 			labels = List.<JCTree>of(pat);
+ 		}
+-		return invoke(Case12.Case12, Case12.CASE_KIND_STATEMENT, labels, stats, null);
++		if (tryResolve(Case.Case12)) {
++			return invoke(Case.Case12, Case.CASE_KIND_STATEMENT, labels, stats, null);
++		}
++		return invoke(Case.Case21, Case.CASE_KIND_STATEMENT, labels, null, stats, null);
+ 	}
+ 	
+ 	//javac versions: 17
diff --git a/debian/patches/series b/debian/patches/series
index 68d66ad..59b0526 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ ignore-apt-errors.patch
 java17-compatibility.patch
 java21-compatibility.patch
 reproducible-builds-spiprocessor.patch
+java21-support.patch