Skip to content

Workaround AssertError that often comes up since switching to JDK 25 #11220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2025
+71 −70
Merged

Workaround AssertError that often comes up since switching to JDK 25 #11220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 70 additions & 69 deletions hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,75 +56,6 @@ public class JsonHelper {
*/
private static <X> X consumeJsonDocumentItems(JsonDocumentReader reader, EmbeddableMappingType embeddableMappingType, boolean returnEmbeddable, WrapperOptions options)
throws SQLException {
record SelectableData(String selectableName, int selectableIndex, SelectableMapping selectableMapping){}
record ParseLevel(
@Nullable SelectableData selectableData,
@Nullable EmbeddableMappingType embeddableMappingType,
@Nullable BasicPluralType<?, ?> arrayType,
@Nullable List<Object> subArrayObjectList,
@Nullable Object [] objectArray
) {
ParseLevel(EmbeddableMappingType embeddableMappingType) {
this(null, embeddableMappingType);
}
ParseLevel(@Nullable SelectableData selectableData, EmbeddableMappingType embeddableMappingType) {
this(
selectableData,
embeddableMappingType,
null,
null,
new Object[embeddableMappingType.getJdbcValueCount()+ ( embeddableMappingType.isPolymorphic() ? 1 : 0 )]
);
}
ParseLevel(@Nullable SelectableData selectableData, BasicPluralType<?, ?> arrayType) {
this( selectableData, null, arrayType, new ArrayList<>(), null );
}

public void addValue(@Nullable SelectableData selectableData, @Nullable Object value) {
if ( embeddableMappingType != null ) {
assert selectableData != null;
objectArray[selectableData.selectableIndex] = value;
}
else {
assert subArrayObjectList != null;
subArrayObjectList.add(value);
}
}

public JdbcMapping determineJdbcMapping(@Nullable SelectableData currentSelectableData) {
if ( currentSelectableData != null ) {
return currentSelectableData.selectableMapping.getJdbcMapping();
}
else if ( arrayType != null ) {
return arrayType.getElementType();
}
else {
assert selectableData != null;
return selectableData.selectableMapping.getJdbcMapping();
}
}

public static String determineSelectablePath(StandardStack<ParseLevel> parseLevel, @Nullable SelectableData currentSelectableData) {
if ( currentSelectableData != null ) {
return currentSelectableData.selectableName;
}
else {
return determineSelectablePath( parseLevel, 0 );
}
}

private static String determineSelectablePath(StandardStack<ParseLevel> stack, int level) {
final ParseLevel parseLevel = stack.peek( level );
assert parseLevel != null;
if ( parseLevel.selectableData != null ) {
return parseLevel.selectableData.selectableName;
}
else {
assert parseLevel.arrayType != null;
return determineSelectablePath( stack, level + 1 ) + ".{element}";
}
}
}
final StandardStack<ParseLevel> parseLevel = new StandardStack<>();
final JsonValueJDBCTypeAdapter adapter = JsonValueJDBCTypeAdapterFactory.getAdapter(reader,returnEmbeddable);

Expand Down Expand Up @@ -458,4 +389,74 @@ public <T> T[] toArray(T[] a) {
}
}

private record SelectableData(String selectableName, int selectableIndex, SelectableMapping selectableMapping){}
private record ParseLevel(
@Nullable SelectableData selectableData,
@Nullable EmbeddableMappingType embeddableMappingType,
@Nullable BasicPluralType<?, ?> arrayType,
@Nullable List<Object> subArrayObjectList,
@Nullable Object [] objectArray
) {
ParseLevel(EmbeddableMappingType embeddableMappingType) {
this(null, embeddableMappingType);
}
ParseLevel(@Nullable SelectableData selectableData, EmbeddableMappingType embeddableMappingType) {
this(
selectableData,
embeddableMappingType,
null,
null,
new Object[embeddableMappingType.getJdbcValueCount()+ ( embeddableMappingType.isPolymorphic() ? 1 : 0 )]
);
}
ParseLevel(@Nullable SelectableData selectableData, BasicPluralType<?, ?> arrayType) {
this( selectableData, null, arrayType, new ArrayList<>(), null );
}

public void addValue(@Nullable SelectableData selectableData, @Nullable Object value) {
if ( embeddableMappingType != null ) {
assert selectableData != null;
objectArray[selectableData.selectableIndex] = value;
}
else {
assert subArrayObjectList != null;
subArrayObjectList.add(value);
}
}

public JdbcMapping determineJdbcMapping(@Nullable SelectableData currentSelectableData) {
if ( currentSelectableData != null ) {
return currentSelectableData.selectableMapping.getJdbcMapping();
}
else if ( arrayType != null ) {
return arrayType.getElementType();
}
else {
assert selectableData != null;
return selectableData.selectableMapping.getJdbcMapping();
}
}

public static String determineSelectablePath(StandardStack<ParseLevel> parseLevel, @Nullable SelectableData currentSelectableData) {
if ( currentSelectableData != null ) {
return currentSelectableData.selectableName;
}
else {
return determineSelectablePath( parseLevel, 0 );
}
}

private static String determineSelectablePath(StandardStack<ParseLevel> stack, int level) {
final ParseLevel parseLevel = stack.peek( level );
assert parseLevel != null;
if ( parseLevel.selectableData != null ) {
return parseLevel.selectableData.selectableName;
}
else {
assert parseLevel.arrayType != null;
return determineSelectablePath( stack, level + 1 ) + ".{element}";
}
}
}

}
2 changes: 1 addition & 1 deletion local-build-plugins/src/main/groovy/local.java-module.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ tasks.withType( JavaCompile ).configureEach {
options.compilerArgumentProviders.add(new CompilerStubsArgumentProvider(stubsDir: new File(project.rootDir, "checkerstubs")))

if (System.getProperty('APT_DEBUG', 'false') == 'true') {
task.options.forkOptions.jvmArgs += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9099']
options.forkOptions.jvmArgs += ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9099']
}
}

Expand Down