HHH-17404 add array of embeddable support

Author: ejannett

hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java

@@ -146,7 +146,6 @@
 import static org.hibernate.type.SqlTypes.DATE;
 import static org.hibernate.type.SqlTypes.DECIMAL;
 import static org.hibernate.type.SqlTypes.DOUBLE;
-import static org.hibernate.type.SqlTypes.DURATION;
 import static org.hibernate.type.SqlTypes.FLOAT;
 import static org.hibernate.type.SqlTypes.GEOMETRY;
 import static org.hibernate.type.SqlTypes.INTEGER;

hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJacksonArrayJdbcType.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.dialect;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import oracle.jdbc.OracleType;
 import oracle.jdbc.driver.DatabaseError;
@@ -12,6 +13,7 @@
 import oracle.sql.json.OracleJsonFactory;
 import oracle.sql.json.OracleJsonGenerator;
 
+import oracle.sql.json.OracleJsonParser;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
@@ -26,6 +28,7 @@
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JsonJdbcType;
 import org.hibernate.type.format.FormatMapper;
+import org.hibernate.type.format.OsonDocumentReader;
 import org.hibernate.type.format.OsonDocumentWriter;
 
 import java.io.ByteArrayOutputStream;
@@ -125,9 +128,19 @@ public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 
 			private X fromOson(InputStream osonBytes, WrapperOptions options) throws Exception {
 				FormatMapper mapper = options.getJsonFormatMapper();
-				JsonParser osonParser = osonFactory.createParser( osonBytes );
+				OracleJsonParser osonParser = new OracleJsonFactory().createJsonBinaryParser( osonBytes );
+				final JdbcType elementJdbcType = getElementJdbcType();
+				if (elementJdbcType instanceof JsonJdbcType) {
+					if (((JsonJdbcType) elementJdbcType).getEmbeddableMappingType() != null) {
+						// embeddable array case.
+						return JsonHelper.deserializeArray( javaType,
+								elementJdbcType, new OsonDocumentReader( osonParser ), options );
+					}
+				}
+				try (JsonParser oParser = ((JsonFactory)osonFactory).createParser(  osonBytes )) {
+					return mapper.readFromSource(  getJavaType(), oParser, options);
+				}
 
-				return mapper.readFromSource(  getJavaType(), osonParser, options);
 			}
 
 			private X doExtraction(OracleJsonDatum datum,  WrapperOptions options) throws SQLException {

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java

@@ -36,6 +36,7 @@
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JsonJdbcType;
 import org.hibernate.type.format.JsonDocumentItemType;
 import org.hibernate.type.format.JsonDocumentReader;
 import org.hibernate.type.format.JsonDocumentWriter;
@@ -264,7 +265,15 @@ private static <X> X consumeJsonDocumentItems(JsonDocumentReader reader, Embedda
 		objectArrayResult = new Object[embeddableMappingType.getJdbcValueCount()+ ( embeddableMappingType.isPolymorphic() ? 1 : 0 )];
 		objectArrays.push( objectArrayResult );
 
-		while(reader.hasNext()) {
+		// We loop on two conditions:
+		//   - the parser still has tokens left
+		//   - the type stack is not empty
+		// Even if the reader has some tokens left, if the type stack is empty,
+		// that means that we have to stop parsing. That may be the case while parsing an object of object array,
+		// the array is not empty, but we ae done parsing that specific object.
+		// When we encounter OBJECT_END the current type is popped out of the stack. When parsing one object of an array we may end up
+		// having an empty stack. Next Objects are parsed in the next round.
+		while(reader.hasNext() && !embeddableMappingTypes.isEmpty()) {
 			JsonDocumentItemType type = reader.next();
 			switch (type) {
 				case VALUE_KEY:
@@ -462,6 +471,15 @@ public static <X> X deserializeArray(
 				case VALUE:
 					arrayList.add( adapter.fromValue(jdbcJavaType, elementJdbcType ,reader, options) );
 					break;
+				case OBJECT_START:
+					assert elementJdbcType instanceof JsonJdbcType;
+					Object o = deserialize(
+							((JsonJdbcType) elementJdbcType).getEmbeddableMappingType(),
+							reader,
+							true,
+							options);
+					arrayList.add(o);
+					break;
 				default:
 					throw new UnsupportedOperationException( "Unexpected JSON type " + type );
 			}

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/EmbeddableAggregate.java

@@ -292,6 +292,14 @@ public void setMutableValue(MutableValue mutableValue) {
 		this.mutableValue = mutableValue;
 	}
 
+	static void assertArraysEquals(EmbeddableAggregate [] a1, EmbeddableAggregate []a2) {
+		Assertions.assertTrue( (a1 == null && a2 == null) || (a1 != null && a2 != null) );
+		Assertions.assertEquals( a1.length, a2.length );
+		for (int i = 0; i < a1.length; i++) {
+			assertEquals(a1[i], a2[i]);
+		}
+	}
+
 	static void assertEquals(EmbeddableAggregate a1, EmbeddableAggregate a2) {
 		Assertions.assertEquals( a1.theInt, a2.theInt );
 		Assertions.assertEquals( a1.theDouble, a2.theDouble );
@@ -338,6 +346,13 @@ static void assertEquals(EmbeddableAggregate a1, EmbeddableAggregate a2) {
 		}
 	}
 
+	public static EmbeddableAggregate[] createAggregateArray1() {
+		return new EmbeddableAggregate[] {createAggregate1(),createAggregate2()};
+	}
+	public static EmbeddableAggregate[] createAggregateArray2() {
+		return new EmbeddableAggregate[] {createAggregate3()};
+	}
+
 	public static EmbeddableAggregate createAggregate1() {
 		final EmbeddableAggregate aggregate = new EmbeddableAggregate();
 		aggregate.theBoolean = true;