HHH-17404 rebase with upstream

Author: ejannett

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

@@ -9,6 +9,7 @@
 import oracle.sql.json.OracleJsonDatum;
 import oracle.sql.json.OracleJsonGenerator;
 
+import org.hibernate.dialect.type.OracleJsonArrayJdbcType;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
@@ -22,6 +23,7 @@
 import org.hibernate.type.descriptor.jdbc.BasicBinder;
 import org.hibernate.type.descriptor.jdbc.BasicExtractor;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JsonHelper;
 import org.hibernate.type.descriptor.jdbc.JsonJdbcType;
 import org.hibernate.type.format.OsonDocumentReader;
 import org.hibernate.type.format.OsonDocumentWriter;

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

@@ -9,6 +9,7 @@
 import oracle.sql.json.OracleJsonDatum;
 import oracle.sql.json.OracleJsonFactory;
 import oracle.sql.json.OracleJsonGenerator;
+import org.hibernate.dialect.type.OracleJsonJdbcType;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
@@ -20,6 +21,7 @@
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 import org.hibernate.type.descriptor.jdbc.BasicBinder;
 import org.hibernate.type.descriptor.jdbc.BasicExtractor;
+import org.hibernate.type.descriptor.jdbc.JsonHelper;
 import org.hibernate.type.format.OsonDocumentReader;
 import org.hibernate.type.format.OsonDocumentWriter;
 

hibernate-core/src/main/java/org/hibernate/dialect/type/OracleJsonJdbcType.java

@@ -24,7 +24,7 @@ public class OracleJsonJdbcType extends OracleJsonBlobJdbcType {
 	 */
 	public static final OracleJsonJdbcType INSTANCE = new OracleJsonJdbcType( null );
 
-	OracleJsonJdbcType(EmbeddableMappingType embeddableMappingType) {
+	protected OracleJsonJdbcType(EmbeddableMappingType embeddableMappingType) {
 		super( embeddableMappingType );
 	}
 

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

@@ -34,10 +34,6 @@
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
-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;

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

@@ -129,6 +129,8 @@ private void moveStateMachine(StringJsonDocumentMarker marker) {
 					this.processingStates.push( JsonProcessingState.ARRAY );
 				}
 				break;
+			default:
+				throw new IllegalStateException( "Unexpected JsonProcessingState " + marker );
 		}
 	}
 

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

@@ -4,8 +4,6 @@
  */
 package org.hibernate.type.format;
 
-import org.hibernate.dialect.StructAttributeValues;
-import org.hibernate.dialect.StructHelper;
 import org.hibernate.internal.util.CharSequenceHelper;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.type.SqlTypes;
@@ -19,10 +17,12 @@
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.StructAttributeValues;
+import org.hibernate.type.descriptor.jdbc.StructHelper;
 
 import java.sql.SQLException;
 
-import static org.hibernate.dialect.StructHelper.instantiate;
+import static org.hibernate.type.descriptor.jdbc.StructHelper.instantiate;
 
 /**
  * JDBC type adapter for String-based JSON document reader.