Handle xjc XmlEnumValue in DynamicJAXB enum #2273
Open
Conversation
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
rfelcman
reviewed
Sep 26, 2024
| 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.
| @@ -96,17 +94,20 @@ public EclipseLinkClassWriter getClassWriter(String className) { | |||
| } | |||
|
|
|||
| public void addEnum(String className, Object... literalLabels) { | |||
| var literalsMap = Arrays.stream(literalLabels) | |||
There was a problem hiding this comment.
var is not preferred as we will backport this PR into 2.7 branch with JDK 8.0 support.
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
|
|
||
| Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved. |
There was a problem hiding this comment.
For a new files Copyright (c) 2024 Oracle... is correct.
| </xs:complexType> | ||
| </xs:element> | ||
|
|
||
| <!-- This test contains exactly 6 enum values to test an ASM boundary case (ICONST) --> |
There was a problem hiding this comment.
This comment seems inconsistent with values 6 enum vs 4 (QTR1...QTR4).
rfelcman
reviewed
Oct 2, 2024
| 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); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To resolve #2272