HHH-16280 Fix JacksonXmlFormatMapper handling of array data types

Author: mbladel

hibernate-core/hibernate-core.gradle

@@ -68,6 +68,8 @@ dependencies {
     testRuntimeOnly testLibs.weld
     testRuntimeOnly testLibs.wildFlyTxnClient
     testRuntimeOnly libs.jackson
+    testRuntimeOnly libs.jacksonXml
+    testRuntimeOnly libs.jacksonJsr310
 
     testAnnotationProcessor project( ':hibernate-jpamodelgen' )
 

hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonXmlFormatMapper.java

@@ -6,12 +6,20 @@
  */
 package org.hibernate.type.format.jackson;
 
-import org.hibernate.type.format.FormatMapper;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.format.FormatMapper;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
 /**
@@ -24,10 +32,13 @@ public final class JacksonXmlFormatMapper implements FormatMapper {
 	private final ObjectMapper objectMapper;
 
 	public JacksonXmlFormatMapper() {
-		this(new XmlMapper());
+		this( new XmlMapper() );
 	}
 
 	public JacksonXmlFormatMapper(ObjectMapper objectMapper) {
+		// needed to automatically find and register Jackson's jsr310 module for java.time support
+		objectMapper.findAndRegisterModules();
+		objectMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false );
 		this.objectMapper = objectMapper;
 	}
 
@@ -36,8 +47,25 @@ public <T> T fromString(CharSequence charSequence, JavaType<T> javaType, Wrapper
 		if ( javaType.getJavaType() == String.class || javaType.getJavaType() == Object.class ) {
 			return (T) charSequence.toString();
 		}
+		if ( javaType.getJavaTypeClass().isArray() && javaType.getJavaTypeClass().getComponentType() == String.class ) {
+			final StringWrapper[] array = (StringWrapper[]) readValueFromString(
+					charSequence,
+					javaType,
+					StringWrapper[].class
+			);
+			final List<String> list = new ArrayList<>( array.length );
+			for ( StringWrapper sw : array ) {
+				list.add( sw.getValue() );
+			}
+			//noinspection unchecked
+			return (T) list.toArray( String[]::new );
+		}
+		return readValueFromString( charSequence, javaType, javaType.getJavaType() );
+	}
+
+	private <T> T readValueFromString(CharSequence charSequence, JavaType<T> javaType, Type type) {
 		try {
-			return objectMapper.readValue( charSequence.toString(), objectMapper.constructType( javaType.getJavaType() ) );
+			return objectMapper.readValue( charSequence.toString(), objectMapper.constructType( type ) );
 		}
 		catch (JsonProcessingException e) {
 			throw new IllegalArgumentException( "Could not deserialize string to java type: " + javaType, e );
@@ -49,12 +77,43 @@ public <T> String toString(T value, JavaType<T> javaType, WrapperOptions wrapper
 		if ( javaType.getJavaType() == String.class || javaType.getJavaType() == Object.class ) {
 			return (String) value;
 		}
+		else if ( javaType.getJavaTypeClass().isArray() ) {
+			if ( javaType.getJavaTypeClass().getComponentType() == String.class ) {
+				final String[] array = (String[]) value;
+				final List<StringWrapper> list = new ArrayList<>( array.length );
+				for ( String s : array ) {
+					list.add( new StringWrapper( s ) );
+				}
+				return writeValueAsString( list.toArray( StringWrapper[]::new ), javaType, StringWrapper[].class );
+			}
+			else if ( javaType.getJavaTypeClass().getComponentType().isEnum() ) {
+				// for enum arrays we need to explicitly pass Byte[] as the writer type
+				return writeValueAsString( value, javaType, Byte[].class );
+			}
+		}
+		return writeValueAsString( value, javaType, javaType.getJavaType() );
+	}
+
+	private <T> String writeValueAsString(Object value, JavaType<T> javaType, Type type) {
 		try {
-			return objectMapper.writerFor( objectMapper.constructType( javaType.getJavaType() ) )
-					.writeValueAsString( value );
+			return objectMapper.writerFor( objectMapper.constructType( type ) ).writeValueAsString( value );
 		}
 		catch (JsonProcessingException e) {
 			throw new IllegalArgumentException( "Could not serialize object of java type: " + javaType, e );
 		}
 	}
+
+	@JsonInclude( JsonInclude.Include.NON_NULL )
+	private static class StringWrapper {
+		private final String value;
+
+		@JsonCreator
+		public StringWrapper(@JsonProperty( "value" ) String value) {
+			this.value = value;
+		}
+
+		public String getValue() {
+			return value;
+		}
+	}
 }

settings.gradle

@@ -84,6 +84,7 @@ dependencyResolutionManagement {
 
             alias( "jackson" ).to ( "com.fasterxml.jackson.core", "jackson-databind" ).version( "2.14.1" )
             alias( "jacksonXml" ).to ( "com.fasterxml.jackson.dataformat", "jackson-dataformat-xml" ).version( "2.14.1" )
+            alias( "jacksonJsr310" ).to( "com.fasterxml.jackson.datatype", "jackson-datatype-jsr310" ).version( "2.14.1" )
             alias( "validator" ).to( "org.hibernate.validator", "hibernate-validator" ).version( "7.0.4.Final" )
 
             alias( "ant" ).to( "org.apache.ant", "ant" ).version( "1.8.2" )