HHH-17404 : applied eview comment

Author: ejannett

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

@@ -73,8 +73,31 @@ public static void serializeArray(MappingType elementMappingType, Object[] value
 				if (value == null) {
 					writer.nullValue();
 				}
-				else {
+				else if ( elementMappingType instanceof EmbeddableMappingType ) {
 					JsonHelper.serialize( (EmbeddableMappingType) elementMappingType, value, options, writer );
+				} else if ( elementMappingType instanceof BasicType<?> ) {
+					//noinspection unchecked
+					final BasicType<Object> basicType = (BasicType<Object>) elementMappingType;
+
+					if ( isArrayType(basicType.getJdbcType())) {
+						final int length = Array.getLength( value );
+						if ( length != 0 ) {
+							//noinspection unchecked
+							final JavaType<Object> elementJavaType = ( (BasicPluralJavaType<Object>) basicType.getJdbcJavaType() ).getElementJavaType();
+							final JdbcType elementJdbcType = ( (ArrayJdbcType) basicType.getJdbcType() ).getElementJdbcType();
+							final Object domainArray = basicType.convertToRelationalValue( value );
+							for ( int j = 0; j < length; j++ ) {
+								writer.serializeJsonValue(Array.get(domainArray,j), elementJavaType, elementJdbcType, options);
+							}
+						}
+					}
+					else {
+						writer.serializeJsonValue(basicType.convertToRelationalValue( value),
+								(JavaType<Object>)basicType.getJdbcJavaType(),basicType.getJdbcType(), options);
+					}
+				}
+				else {
+					throw new UnsupportedOperationException( "Support for mapping type not yet implemented: " + elementMappingType.getClass().getName() );
 				}
 			}
 			catch (IOException e) {

hibernate-core/src/main/java/org/hibernate/type/format/OsonDocumentReader.java

@@ -100,9 +100,8 @@ public JsonDocumentItemType next() {
 				currentValue = this.parser.getBytes();
 				return JsonDocumentItemType.VALUE;
 			default :
-				assert false:"Unknown OSON event";
+				throw new IllegalStateException( "Unknown OSON event: " + evt );
 		}
-		return null;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/type/format/OsonDocumentWriter.java

@@ -22,9 +22,7 @@
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.time.Duration;
-import java.time.Instant;
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.util.UUID;
 
 /**
@@ -108,7 +106,14 @@ public JsonDocumentWriter stringValue(String value) {
 
 	@Override
 	public JsonDocumentWriter numberValue(Number value) {
-		this.generator.write((BigDecimal) value );
+		if (value instanceof BigDecimal) {
+			this.generator.write((BigDecimal) value );
+		} else if (value instanceof BigInteger) {
+			this.generator.write((BigInteger) value );
+		} else {
+			//fallback.
+			this.generator.write( value.longValue() );
+		}
 		return this;
 	}
 
@@ -214,17 +219,8 @@ private void serializeValue(Object value,
 				}
 				break;
 			case SqlTypes.TIMESTAMP_UTC:
-				if( value instanceof OffsetDateTime ) {
-					OffsetDateTime odt = javaType.unwrap( value, OffsetDateTime.class, options );
-					generator.write( odt );
-					break;
-				}
-				else if (value instanceof Instant ) {
-					Instant instant = javaType.unwrap( value, Instant.class, options );
-					generator.write(instant.atOffset( ZoneOffset.UTC )  );
-					break;
-				}
-				generator.write( javaType.unwrap( value,String.class,options ) );
+				OffsetDateTime odt = javaType.unwrap( value, OffsetDateTime.class, options );
+				generator.write( odt );
 				break;
 			case SqlTypes.NUMERIC:
 			case SqlTypes.DECIMAL:
@@ -251,8 +247,7 @@ else if (value instanceof Instant ) {
 				break;
 			case SqlTypes.ARRAY:
 			case SqlTypes.JSON_ARRAY:
-				assert false:"array case should be treated at upper level";
-				break;
+				throw new IllegalStateException( "array case should be treated at upper level" );
 			default:
 				throw new UnsupportedOperationException( "Unsupported JdbcType nested in JSON: " + jdbcType );
 		}