) context.get("ReadError"));
@@ -404,8 +538,10 @@ public Object doUnmarshal(final Object result, final HierarchicalStreamReader re
// it should be already reported, but we report with INFO just in case
StringBuilder message = new StringBuilder("There was a problem reporting unmarshalling field errors");
Level level = Level.WARNING;
- if (t instanceof IllegalStateException && t.getMessage().contains("Expected 1 instance of " + OldDataMonitor.class.getName())) {
- message.append(". Make sure this code is executed after InitMilestone.EXTENSIONS_AUGMENTED stage, for example in Plugin#postInitialize instead of Plugin#start");
+ if (t instanceof IllegalStateException
+ && t.getMessage().contains("Expected 1 instance of " + OldDataMonitor.class.getName())) {
+ message.append(
+ ". Make sure this code is executed after InitMilestone.EXTENSIONS_AUGMENTED stage, for example in Plugin#postInitialize instead of Plugin#start");
level = Level.INFO; // it was reported when getting the singleton for OldDataMonitor
}
// it should be already reported, but we report with INFO just in case
@@ -417,13 +553,19 @@ public Object doUnmarshal(final Object result, final HierarchicalStreamReader re
}
/**
- * Returns whether the current user authentication is allowed to have errors loading data reported.
+ * Returns whether the current user authentication is allowed to have errors
+ * loading data reported.
*
- * {@link ACL#SYSTEM} always has errors reported.
- * If {@link #RECORD_FAILURES_FOR_ALL_AUTHENTICATIONS} is {@code true}, errors are reported for all authentications.
- * Otherwise errors are reported for users with {@link Jenkins#ADMINISTER} permission if {@link #RECORD_FAILURES_FOR_ADMINS} is {@code true}.
+ *
+ * {@link ACL#SYSTEM} always has errors reported.
+ * If {@link #RECORD_FAILURES_FOR_ALL_AUTHENTICATIONS} is {@code true}, errors
+ * are reported for all authentications.
+ * Otherwise errors are reported for users with {@link Jenkins#ADMINISTER}
+ * permission if {@link #RECORD_FAILURES_FOR_ADMINS} is {@code true}.
+ *
*
- * @return whether the current user authentication is allowed to have errors loading data reported.
+ * @return whether the current user authentication is allowed to have errors
+ * loading data reported.
*/
private static boolean shouldReportUnloadableDataForCurrentUser() {
if (RECORD_FAILURES_FOR_ALL_AUTHENTICATIONS) {
@@ -446,7 +588,8 @@ public static void addErrorInContext(UnmarshallingContext context, Throwable e)
private boolean fieldDefinedInClass(Object result, String attrName) {
// during unmarshalling, unmarshal into transient fields like XStream 1.1.3
- //boolean fieldExistsInClass = reflectionProvider.fieldDefinedInClass(attrName, result.getClass());
+ // boolean fieldExistsInClass = reflectionProvider.fieldDefinedInClass(attrName,
+ // result.getClass());
return reflectionProvider.getFieldOrNull(result.getClass(), attrName) != null;
}
@@ -470,7 +613,8 @@ private void writeValueToImplicitCollection(
Map> implicitCollectionElementTypes,
Object result,
String itemFieldName) {
- String fieldName = mapper.getFieldNameForItemTypeAndName(context.getRequiredType(), value.getClass(), itemFieldName);
+ String fieldName = mapper.getFieldNameForItemTypeAndName(context.getRequiredType(), value.getClass(),
+ itemFieldName);
if (fieldName != null) {
Collection collection = implicitCollections.get(fieldName);
if (collection == null) {
@@ -487,13 +631,15 @@ private void writeValueToImplicitCollection(
reflectionProvider.writeField(result, fieldName, collection, null);
implicitCollections.put(fieldName, collection);
Type fieldGenericType = field.getGenericType();
- Type elementGenericType = Types.getTypeArgument(Types.getBaseClass(fieldGenericType, Collection.class), 0, Object.class);
+ Type elementGenericType = Types.getTypeArgument(Types.getBaseClass(fieldGenericType, Collection.class),
+ 0, Object.class);
Class elementType = Types.erasure(elementGenericType);
implicitCollectionElementTypes.put(fieldName, elementType);
}
Class elementType = implicitCollectionElementTypes.getOrDefault(fieldName, Object.class);
if (!elementType.isInstance(value)) {
- var exception = new ConversionException("Invalid element type for implicit collection for field: " + fieldName);
+ var exception = new ConversionException(
+ "Invalid element type for implicit collection for field: " + fieldName);
// c.f. TreeUnmarshaller.addInformationTo
exception.add("required-type", elementType.getName());
exception.add("class", value.getClass().getName());
@@ -543,7 +689,8 @@ public void add(Class definedInCls, String fieldName) {
}
- private Class determineType(HierarchicalStreamReader reader, boolean validField, Object result, String fieldName, Class definedInCls) {
+ private Class determineType(HierarchicalStreamReader reader, boolean validField, Object result, String fieldName,
+ Class definedInCls) {
String classAttribute = reader.getAttribute(mapper.aliasForAttribute("class"));
if (classAttribute != null) {
Class specifiedType = mapper.realClass(classAttribute);
diff --git a/core/src/test/java/hudson/util/RobustReflectionConverterTest.java b/core/src/test/java/hudson/util/RobustReflectionConverterTest.java
index 5b6042008154..9985adf5d02d 100644
--- a/core/src/test/java/hudson/util/RobustReflectionConverterTest.java
+++ b/core/src/test/java/hudson/util/RobustReflectionConverterTest.java
@@ -462,4 +462,56 @@ protected Object createCollection(Class type) {
}
}
}
+
+ // record deserialization (#26077)
+
+ public record ConfigRecord(String name, int age) {}
+
+ @Test
+ @Issue("JENKINS-26077")
+ void unmarshalRecord() {
+ XStream2 xs = new XStream2();
+ xs.alias("config-record", ConfigRecord.class);
+ String xml = "Jenkins20";
+ ConfigRecord rec = (ConfigRecord) xs.fromXML(xml);
+ assertEquals("Jenkins", rec.name());
+ assertEquals(20, rec.age());
+ }
+
+ @Test
+ @Issue("JENKINS-26077")
+ void unmarshalRecordWithMissingField() {
+ XStream2 xs = new XStream2();
+ xs.alias("config-record", ConfigRecord.class);
+ // age is omitted, should default to 0
+ String xml = "Jenkins";
+ ConfigRecord rec = (ConfigRecord) xs.fromXML(xml);
+ assertEquals("Jenkins", rec.name());
+ assertEquals(0, rec.age(), "primitive int should default to 0 when missing from XML");
+ }
+
+ @Test
+ @Issue("JENKINS-26077")
+ void unmarshalRecordWithExtraField() {
+ XStream2 xs = new XStream2();
+ xs.alias("config-record", ConfigRecord.class);
+ // extra element that doesn't exist on the record
+ String xml = "Jenkins20ignored";
+ ConfigRecord rec = (ConfigRecord) xs.fromXML(xml);
+ assertEquals("Jenkins", rec.name());
+ assertEquals(20, rec.age());
+ }
+
+ @Test
+ @Issue("JENKINS-26077")
+ void recordRoundTrip() {
+ XStream2 xs = new XStream2();
+ xs.alias("config-record", ConfigRecord.class);
+ ConfigRecord original = new ConfigRecord("Jenkins", 20);
+ String xml = xs.toXML(original);
+ ConfigRecord deserialized = (ConfigRecord) xs.fromXML(xml);
+ assertEquals(original.name(), deserialized.name());
+ assertEquals(original.age(), deserialized.age());
+ }
+
}