HHH-17404 : fix build after merge

ejannett · ejannett · commit 22c6d1ea92d1 · 2025-03-26T14:22:08.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
@@ -776,7 +776,7 @@ private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(
 						.getDefaultConnectionHandlingMode();
 	}
 
-	private static FormatMapper determineJsonFormatMapper(Object setting, StrategySelector strategySelector, ConfigurationService configurationService) {
+	private static FormatMapper determineJsonFormatMapper(Object setting, StrategySelector strategySelector) {
 		return strategySelector.resolveDefaultableStrategy(
 				FormatMapper.class,
 				setting,
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java b/hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java
@@ -17,8 +17,8 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
-
 import org.hibernate.Internal;
+import org.hibernate.internal.build.AllowReflection;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.internal.util.collections.StandardStack;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
@@ -34,6 +34,8 @@
 import org.hibernate.dialect.temptable.TemporaryTableKind;
 import org.hibernate.dialect.unique.CreateTableUniqueDelegate;
 import org.hibernate.dialect.unique.UniqueDelegate;
+import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
 import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
@@ -84,7 +86,6 @@
 import org.hibernate.type.NullType;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
-import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.NullJdbcType;
 import org.hibernate.type.descriptor.jdbc.ObjectNullAsNullTypeJdbcType;
@@ -986,7 +987,7 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 
 		final ConfigurationService configService = serviceRegistry.requireService( ConfigurationService.class );
 
-	      
+
 		final String mapperName = configService.getSetting( "hibernate.type.json_format_mapper",
 				StandardConverters.STRING,JACKSON_MAPPER_NAME);
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcTypeConstructor.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonArrayJdbcTypeConstructor.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJacksonArrayJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJacksonArrayJdbcType.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
@@ -133,7 +133,7 @@ public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 		return new BasicExtractor<>( javaType, this ) {
 
 			private X fromOson(InputStream osonBytes, WrapperOptions options) throws Exception {
-				FormatMapper mapper = options.getSession().getSessionFactory().getFastSessionServices().getJsonFormatMapper();
+				FormatMapper mapper = options.getJsonFormatMapper();
 				JsonFactory osonFactory = (JsonFactory) osonFactoryKlass.getDeclaredConstructor().newInstance();
 				JsonParser osonParser = osonFactory.createParser( osonBytes );
 				return mapper.readFromSource(  getJavaType(), osonParser, options);
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJacksonJdbcType.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJacksonJdbcType.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
@@ -85,7 +85,7 @@ public <X> ValueBinder<X> getBinder(JavaType<X> javaType) {
 
 			private <X> byte[] toOson(X value, JavaType<X> javaType, WrapperOptions options) throws Exception {
 
-				FormatMapper mapper = options.getSession().getSessionFactory().getFastSessionServices().getJsonFormatMapper();
+				FormatMapper mapper = options.getJsonFormatMapper();
 
 				if (getEmbeddableMappingType() != null) {
 					ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -96,7 +96,7 @@ private <X> byte[] toOson(X value, JavaType<X> javaType, WrapperOptions options)
 					}
 					return out.toByteArray();
 				}
-				
+
 				ByteArrayOutputStream out = new ByteArrayOutputStream();
 				JsonFactory osonFactory = (JsonFactory) osonFactoryKlass.getDeclaredConstructor().newInstance();
 				try (JsonGenerator osonGen = osonFactory.createGenerator( out )) {
@@ -140,7 +140,7 @@ public <X> ValueExtractor<X> getExtractor(JavaType<X> javaType) {
 
 			private X fromOson(InputStream osonBytes, WrapperOptions options) throws Exception {
 
-				FormatMapper mapper = options.getSession().getSessionFactory().getFastSessionServices().getJsonFormatMapper();
+				FormatMapper mapper = options.getJsonFormatMapper();
 
 				if (getEmbeddableMappingType() != null &&
 						getJavaType().getJavaTypeClass() == Object[].class) {
@@ -185,8 +185,8 @@ private X doExtraction(OracleJsonDatum datum,  WrapperOptions options) throws SQ
 
 			@Override
 			protected X doExtract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
-				 OracleJsonDatum ojd = rs.getObject( paramIndex, OracleJsonDatum.class );
-				 return doExtraction(ojd,options);
+				OracleJsonDatum ojd = rs.getObject( paramIndex, OracleJsonDatum.class );
+				return doExtraction(ojd,options);
 
 			}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java b/hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java
@@ -90,7 +90,7 @@ public static AggregateSupport valueOf(Dialect dialect, boolean useDateStoredAsS
 			default -> version.isSameOrAfter( 23 )
 				? useDateStoredAsString?OracleAggregateSupport.V23_INSTANCE:
 				OracleAggregateSupport.V23_OSON_EXT_INSTANCE
-                                : OracleAggregateSupport.LEGACY_INSTANCE;
+								: OracleAggregateSupport.LEGACY_INSTANCE;
 		};
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentItemType.java b/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentItemType.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentReader.java b/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentReader.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentReaderFactory.java b/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentReaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentWriter.java b/hibernate-core/src/main/java/org/hibernate/type/format/JsonDocumentWriter.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/JsonValueJDBCTypeAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/format/JsonValueJDBCTypeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/JsonValueJDBCTypeAdapterFactory.java b/hibernate-core/src/main/java/org/hibernate/type/format/JsonValueJDBCTypeAdapterFactory.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/OsonDocumentReader.java b/hibernate-core/src/main/java/org/hibernate/type/format/OsonDocumentReader.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/OsonDocumentWriter.java b/hibernate-core/src/main/java/org/hibernate/type/format/OsonDocumentWriter.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/OsonValueJDBCTypeAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/format/OsonValueJDBCTypeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocument.java b/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocument.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentMarker.java b/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentMarker.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentReader.java b/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentReader.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentWriter.java b/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentWriter.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonValueJDBCTypeAdapter.java b/hibernate-core/src/main/java/org/hibernate/type/format/StringJsonValueJDBCTypeAdapter.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format;
@@ -133,7 +133,7 @@ else if ( jdbcJavaType instanceof EnumJavaType<?> ) {
 								options
 						);
 						final EmbeddableMappingType embeddableMappingType = aggregateJdbcType.getEmbeddableMappingType();
-						return instantiate( embeddableMappingType, subAttributeValues, options.getSessionFactory() ) ;
+						return instantiate( embeddableMappingType, subAttributeValues ) ;
 					}
 					return subValues;
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonOsonFormatMapper.java b/hibernate-core/src/main/java/org/hibernate/type/format/jackson/JacksonOsonFormatMapper.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.type.format.jackson;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringJsonDocumentReaderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringJsonDocumentReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringJsonDocumentWriterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/util/StringJsonDocumentWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.util;

Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(`
`776`	`776`	`.getDefaultConnectionHandlingMode();`
`777`	`777`	`}`
`778`	`778`
`779`		`- private static FormatMapper determineJsonFormatMapper(Object setting, StrategySelector strategySelector, ConfigurationService configurationService) {`
	`779`	`+ private static FormatMapper determineJsonFormatMapper(Object setting, StrategySelector strategySelector) {`
`780`	`780`	`return strategySelector.resolveDefaultableStrategy(`
`781`	`781`	`FormatMapper.class,`
`782`	`782`	`setting,`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static AggregateSupport valueOf(Dialect dialect, boolean useDateStoredAsS`
`90`	`90`	`default -> version.isSameOrAfter( 23 )`
`91`	`91`	`? useDateStoredAsString?OracleAggregateSupport.V23_INSTANCE:`
`92`	`92`	`OracleAggregateSupport.V23_OSON_EXT_INSTANCE`
`93`		`- : OracleAggregateSupport.LEGACY_INSTANCE;`
	`93`	`+ : OracleAggregateSupport.LEGACY_INSTANCE;`
`94`	`94`	`};`
`95`	`95`	`}`
`96`	`96`