Skip to content

More refactoring to model binder #11334

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 25, 2025
+500 −422
Merged

More refactoring to model binder #11334

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
15 changes: 9 additions & 6 deletions .../src/main/java/org/hibernate/boot/model/source/internal/hbm/AbstractEntitySourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
import org.hibernate.internal.util.collections.CollectionHelper;

import static java.util.Collections.emptyMap;
import static org.hibernate.internal.util.StringHelper.isNotEmpty;
import static org.hibernate.internal.util.StringHelper.unqualify;

/**
* @author Steve Ebersole
Expand Down Expand Up @@ -97,19 +99,20 @@ protected AbstractEntitySourceImpl(MappingDocument sourceMappingDocument, JaxbHb
);
}

public static EntityNamingSourceImpl extractEntityNamingSource(
static EntityNamingSourceImpl extractEntityNamingSource(
MappingDocument sourceMappingDocument,
EntityInfo jaxbEntityMapping) {
final String className = sourceMappingDocument.qualifyClassName( jaxbEntityMapping.getName() );
final String mappingEntityName = jaxbEntityMapping.getEntityName();
final String entityName;
final String jpaEntityName;
if ( StringHelper.isNotEmpty( jaxbEntityMapping.getEntityName() ) ) {
entityName = jaxbEntityMapping.getEntityName();
jpaEntityName = jaxbEntityMapping.getEntityName();
if ( isNotEmpty( mappingEntityName ) ) {
entityName = mappingEntityName;
jpaEntityName = mappingEntityName;
}
else {
entityName = className;
jpaEntityName = StringHelper.unqualify( className );
jpaEntityName = unqualify( className );
}
return new EntityNamingSourceImpl( entityName, className, jpaEntityName );
}
Expand All @@ -122,7 +125,7 @@ private FilterSource[] buildFilterSources() {
return NO_FILTER_SOURCES;
}

FilterSource[] results = new FilterSource[size];
final var results = new FilterSource[size];
for ( int i = 0; i < size; i++ ) {
JaxbHbmFilterType element = jaxbClassElement.getFilter().get( i );
results[i] = new FilterSourceImpl( sourceMappingDocument(), element );
Expand Down
10 changes: 6 additions & 4 deletions ...re/src/main/java/org/hibernate/boot/model/source/internal/hbm/EntityNamingSourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
package org.hibernate.boot.model.source.internal.hbm;

import org.hibernate.boot.model.source.spi.EntityNamingSource;
import org.hibernate.internal.util.StringHelper;
import org.hibernate.mapping.PersistentClass;

import static org.hibernate.internal.util.StringHelper.isNotEmpty;

/**
* Implementation of EntityNamingSource
*
Expand All @@ -24,12 +25,13 @@ public EntityNamingSourceImpl(String entityName, String className, String jpaEnt
this.entityName = entityName;
this.className = className;
this.jpaEntityName = jpaEntityName;

this.typeName = StringHelper.isNotEmpty( className ) ? className : entityName;
this.typeName = isNotEmpty( className ) ? className : entityName;
}

public EntityNamingSourceImpl(PersistentClass entityBinding) {
this( entityBinding.getEntityName(), entityBinding.getClassName(), entityBinding.getJpaEntityName() );
this( entityBinding.getEntityName(),
entityBinding.getClassName(),
entityBinding.getJpaEntityName() );
}

@Override
Expand Down
Loading