Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-03-06 08:29:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2885 ensure openjpa-junit5 can support jakarta as well without any shade

Browse Source
This commit is contained in:
Romain Manni-Bucau 2021-10-26 16:54:26 +02:00
parent 3b6a69e9f0
commit 1fdf245200
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openjpa-junit5/src/main/java/org/apache/openjpa/junit5/internal/OpenJPADirectoriesEnhancer.java
View File

@ -205,9 +205,12 @@ public class OpenJPADirectoriesEnhancer implements Runnable {
private static class OpenJpaClassLoader extends BaseClassLoader {
private static final String PERSITENCE_CAPABLE = Type.getDescriptor(PersistenceCapable.class);
private static final String ENTITY = Type.getDescriptor(Entity.class);
private static final String EMBEDDABLE = Type.getDescriptor(Embeddable.class);
private static final String MAPPED_SUPERCLASS = Type.getDescriptor(MappedSuperclass.class);
private static final String ENTITY = "Ljavax/persistence/Entity;";
private static final String ENTITY2 = "Ljakarta/persistence/Entity;";
private static final String EMBEDDABLE = "Ljavax/persistence/Entity;";
private static final String EMBEDDABLE2 = "Ljakarta/persistence/Entity;";
private static final String MAPPED_SUPERCLASS = "Ljavax/persistence/Entity;";
private static final String MAPPED_SUPERCLASS2 = "Ljakarta/persistence/Entity;";
private final MetaDataRepository repos;
private final ClassLoader tmpLoader;
@ -298,7 +301,10 @@ public class OpenJPADirectoriesEnhancer implements Runnable {
public AnnotationVisitor visitAnnotation(final String descriptor, final boolean visible) {
if (ENTITY.equals(descriptor) ||
EMBEDDABLE.equals(descriptor) ||
MAPPED_SUPERCLASS.equals(descriptor)) {
MAPPED_SUPERCLASS.equals(descriptor) ||
ENTITY2.equals(descriptor) ||
EMBEDDABLE2.equals(descriptor) ||
MAPPED_SUPERCLASS2.equals(descriptor)) {
throw new MissingEnhancement(); // we already went into visit() so we miss the enhancement
}
return new EmptyVisitor().visitAnnotation(descriptor, visible);