Handle xjc XmlEnumValue in DynamicJAXB enum #2273
Conversation
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.*; |
There was a problem hiding this comment.
Please don't use * in imports. We prefer specific imports like removed part.
...lipse.persistence.core/src/main/java/org/eclipse/persistence/dynamic/DynamicClassLoader.java
Outdated
Show resolved
Hide resolved
...nce.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/dynamic/xmlenum-numbers.xsd
Outdated
Show resolved
Hide resolved
...nce.moxy/src/test/resources/org/eclipse/persistence/testing/jaxb/dynamic/xmlenum-numbers.xsd
Outdated
Show resolved
Hide resolved
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.*; |
There was a problem hiding this comment.
Please use specific imports instead of ... .* This should be applied to all changes.
| @@ -223,7 +223,7 @@ protected void addMethods(ClassWriter cw, String parentClassType) { | |||
|
|
|||
| protected byte[] createEnum(EnumInfo enumInfo) { | |||
|
|
|||
| String[] enumValues = enumInfo.getLiteralLabels(); | |||
| var enumValues = enumInfo.getEnumValues(); | |||
There was a problem hiding this comment.
Please use specific type instead of var.
| for (String enumValue : enumValues) { | ||
| cw.visitField(Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL + Opcodes.ACC_STATIC + Opcodes.ACC_ENUM, enumValue, "L" + internalClassName + ";", null, null); | ||
| for (var enumValue : enumValues.entrySet()) { | ||
| var fv = cw.visitField(Opcodes.ACC_PUBLIC + Opcodes.ACC_FINAL + Opcodes.ACC_STATIC + Opcodes.ACC_ENUM, enumValue.getKey(), "L" + internalClassName + ";", null, null); |
| @@ -92,6 +95,16 @@ public void initialize(DatabaseMapping mapping, Session session) { | |||
| super.initialize(mapping, session); | |||
| } | |||
|
|
|||
| private String getEnumValue(Enum theEnum) { | |||
| try { | |||
| Field field = theEnum.getClass().getField(theEnum.name()); | |||
There was a problem hiding this comment.
Please use (maybe add new method into) https://github.com/eclipse-ee4j/eclipselink/blob/master/moxy/org.eclipse.persistence.moxy/src/main/java/org/eclipse/persistence/jaxb/ReflectionUtils.java
to ensure, that PrivilegedAccessHelper.callDoPrivilegedWithException( is used instead of direct call.
|
It was merged into master -> upcoming 5.x version. If You want it into EL 4.x please make a backport against 4.0 branch. |
To resolve #2272