Fixes #258 @JsonbPropertyOrder names should reflect class names before renaming Signed-off-by: David Kral <david.k.kral@oracle.com>
diff --git a/src/main/java/org/eclipse/yasson/internal/model/customization/ordering/PropertyOrdering.java b/src/main/java/org/eclipse/yasson/internal/model/customization/ordering/PropertyOrdering.java index 31e0954..948f362 100644 --- a/src/main/java/org/eclipse/yasson/internal/model/customization/ordering/PropertyOrdering.java +++ b/src/main/java/org/eclipse/yasson/internal/model/customization/ordering/PropertyOrdering.java
@@ -53,7 +53,7 @@ */ public List<PropertyModel> orderProperties(List<PropertyModel> properties, ClassModel classModel) { Map<String, PropertyModel> byReadName = new HashMap<>(); - properties.stream().forEach(propertyModel -> byReadName.put(propertyModel.getReadName(), propertyModel)); + properties.stream().forEach(propertyModel -> byReadName.put(propertyModel.getPropertyName(), propertyModel)); String[] order = classModel.getClassCustomization().getPropertyOrder(); List<PropertyModel> sortedProperties = new ArrayList<>();
diff --git a/src/test/java/org/eclipse/yasson/customization/PropertyOrderTest.java b/src/test/java/org/eclipse/yasson/customization/PropertyOrderTest.java index 844f5e7..bd413d6 100644 --- a/src/test/java/org/eclipse/yasson/customization/PropertyOrderTest.java +++ b/src/test/java/org/eclipse/yasson/customization/PropertyOrderTest.java
@@ -105,8 +105,8 @@ @JsonbPropertyOrder( { - "from", - "count" + "fromIndex", + "numberOfItems" } ) public class Range {