-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #28798 from gsmet/2.13.4-backports-1
2.13 - Various Jakarta-related backports
- Loading branch information
Showing
14 changed files
with
150 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
...c/jdbc-db2/deployment/src/main/java/io/quarkus/jdbc/db2/deployment/JakartaEnablement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package io.quarkus.jdbc.db2.deployment; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import org.eclipse.transformer.action.ActionContext; | ||
| import org.eclipse.transformer.action.ByteData; | ||
| import org.eclipse.transformer.action.impl.ActionContextImpl; | ||
| import org.eclipse.transformer.action.impl.ByteDataImpl; | ||
| import org.eclipse.transformer.action.impl.ClassActionImpl; | ||
| import org.eclipse.transformer.action.impl.SelectionRuleImpl; | ||
| import org.eclipse.transformer.action.impl.SignatureRuleImpl; | ||
| import org.eclipse.transformer.util.FileUtils; | ||
| import org.objectweb.asm.ClassReader; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import io.quarkus.bootstrap.classloading.QuarkusClassLoader; | ||
| import io.quarkus.deployment.annotations.BuildProducer; | ||
| import io.quarkus.deployment.annotations.BuildStep; | ||
| import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; | ||
|
|
||
| /** | ||
| * The DB2 driver is compiled using references to classes in the javax.transaction | ||
| * package; we need to transform these to fix compatibility with jakarta.transaction. | ||
| * We do this by leveraging the Eclipse Transformer project during Augmentation, so | ||
| * that end users don't need to bother. | ||
| */ | ||
| public class JakartaEnablement { | ||
|
|
||
| private static final List<String> CLASSES_NEEDING_TRANSFORMATION = List.of( | ||
| "com.ibm.db2.jcc.t2zos.ab", | ||
| "com.ibm.db2.jcc.t2zos.T2zosConnection", | ||
| "com.ibm.db2.jcc.t2zos.T2zosConfiguration"); | ||
|
|
||
| @BuildStep | ||
| void transformToJakarta(BuildProducer<BytecodeTransformerBuildItem> transformers) { | ||
| if (QuarkusClassLoader.isClassPresentAtRuntime("jakarta.transaction.Transaction")) { | ||
| JakartaTransformer tr = new JakartaTransformer(); | ||
| for (String classname : CLASSES_NEEDING_TRANSFORMATION) { | ||
| final BytecodeTransformerBuildItem item = new BytecodeTransformerBuildItem.Builder() | ||
| .setCacheable(true) | ||
| .setContinueOnFailure(false) | ||
| .setClassToTransform(classname) | ||
| .setClassReaderOptions(ClassReader.SKIP_DEBUG) | ||
| .setInputTransformer(tr::transform) | ||
| .build(); | ||
| transformers.produce(item); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static class JakartaTransformer { | ||
|
|
||
| private final Logger logger; | ||
| private final ActionContext ctx; | ||
| private static final Map<String, String> renames = Collections.singletonMap(forbiddenName(), "jakarta.transaction"); | ||
|
|
||
| JakartaTransformer() { | ||
| logger = LoggerFactory.getLogger("JakartaTransformer"); | ||
| //N.B. we enable only this single transformation of package renames, not the full set of capabilities of Eclipse Transformer; | ||
| //this might need tailoring if the same idea gets applied to a different context. | ||
| ctx = new ActionContextImpl(logger, | ||
| new SelectionRuleImpl(logger, Collections.emptyMap(), Collections.emptyMap()), | ||
| new SignatureRuleImpl(logger, renames, null, null, null, null, null, Collections.emptyMap())); | ||
| } | ||
|
|
||
| //Need to prevent the Eclipse Transformer - which is run on this whole code base - to actually replace this name: | ||
| private static String forbiddenName() { | ||
| StringBuilder sb = new StringBuilder("java") | ||
| .append("x.") | ||
| .append("transaction"); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| byte[] transform(final String name, final byte[] bytes) { | ||
| logger.info("Jakarta EE compatibility enhancer for Quarkus: transforming " + name); | ||
| final ClassActionImpl classTransformer = new ClassActionImpl(ctx); | ||
| final ByteBuffer input = ByteBuffer.wrap(bytes); | ||
| final ByteData inputData = new ByteDataImpl(name, input, FileUtils.DEFAULT_CHARSET); | ||
| final ByteData outputData = classTransformer.apply(inputData); | ||
| return outputData.buffer().array(); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters