HHH-18118 fixed comparison of class field with itself
This commit is contained in:
parent
ebaba54a83
commit
d53c9aa7cd
|
@ -39,8 +39,6 @@ public class EntityRepresentationStrategyMap implements EntityRepresentationStra
|
||||||
private final ProxyFactory proxyFactory;
|
private final ProxyFactory proxyFactory;
|
||||||
private final EntityInstantiatorDynamicMap instantiator;
|
private final EntityInstantiatorDynamicMap instantiator;
|
||||||
|
|
||||||
private final Map<String, PropertyAccess> propertyAccessMap = new ConcurrentHashMap<>();
|
|
||||||
|
|
||||||
public EntityRepresentationStrategyMap(
|
public EntityRepresentationStrategyMap(
|
||||||
PersistentClass bootType,
|
PersistentClass bootType,
|
||||||
RuntimeModelCreationContext creationContext) {
|
RuntimeModelCreationContext creationContext) {
|
||||||
|
@ -51,14 +49,6 @@ public class EntityRepresentationStrategyMap implements EntityRepresentationStra
|
||||||
this.proxyFactory = createProxyFactory( bootType );
|
this.proxyFactory = createProxyFactory( bootType );
|
||||||
this.instantiator = new EntityInstantiatorDynamicMap( bootType );
|
this.instantiator = new EntityInstantiatorDynamicMap( bootType );
|
||||||
|
|
||||||
for ( Property property : bootType.getPropertyClosure() ) {
|
|
||||||
//TODO: redesign how PropertyAccessors are acquired...
|
|
||||||
final PropertyAccess propertyAccess = PropertyAccessStrategyMapImpl.INSTANCE
|
|
||||||
.buildPropertyAccess( null, property.getName(), true );
|
|
||||||
|
|
||||||
propertyAccessMap.put(property.getName(), propertyAccess);
|
|
||||||
}
|
|
||||||
|
|
||||||
createProxyFactory( bootType );
|
createProxyFactory( bootType );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,6 @@ public class PatternRenderer {
|
||||||
* @param argumentRenderingModes The rendering modes for arguments
|
* @param argumentRenderingModes The rendering modes for arguments
|
||||||
*/
|
*/
|
||||||
public PatternRenderer(String pattern, SqlAstNodeRenderingMode[] argumentRenderingModes) {
|
public PatternRenderer(String pattern, SqlAstNodeRenderingMode[] argumentRenderingModes) {
|
||||||
final Set<Integer> paramNumbers = new HashSet<>();
|
|
||||||
final List<String> chunkList = new ArrayList<>();
|
final List<String> chunkList = new ArrayList<>();
|
||||||
final List<Integer> paramList = new ArrayList<>();
|
final List<Integer> paramList = new ArrayList<>();
|
||||||
final StringBuilder chunk = new StringBuilder( 10 );
|
final StringBuilder chunk = new StringBuilder( 10 );
|
||||||
|
@ -98,8 +97,7 @@ public class PatternRenderer {
|
||||||
vararg = paramList.size();
|
vararg = paramList.size();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int paramNumber = Integer.valueOf( index.toString() );
|
int paramNumber = Integer.parseInt( index.toString() );
|
||||||
paramNumbers.add( paramNumber );
|
|
||||||
paramList.add( paramNumber );
|
paramList.add( paramNumber );
|
||||||
index.setLength(0);
|
index.setLength(0);
|
||||||
if ( paramNumber > max ) {
|
if ( paramNumber > max ) {
|
||||||
|
|
|
@ -41,7 +41,6 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
|
||||||
private List<EntityHolder> loadingEntityHolders;
|
private List<EntityHolder> loadingEntityHolders;
|
||||||
private List<EntityHolder> reloadedEntityHolders;
|
private List<EntityHolder> reloadedEntityHolders;
|
||||||
private Map<CollectionKey, LoadingCollectionEntry> loadingCollectionMap;
|
private Map<CollectionKey, LoadingCollectionEntry> loadingCollectionMap;
|
||||||
private List<CollectionInitializer<?>> arrayInitializers;
|
|
||||||
|
|
||||||
private final PreLoadEvent preLoadEvent;
|
private final PreLoadEvent preLoadEvent;
|
||||||
private final PostLoadEvent postLoadEvent;
|
private final PostLoadEvent postLoadEvent;
|
||||||
|
@ -130,12 +129,6 @@ public class JdbcValuesSourceProcessingStateStandardImpl implements JdbcValuesSo
|
||||||
}
|
}
|
||||||
|
|
||||||
loadingCollectionMap.put( key, loadingCollectionEntry );
|
loadingCollectionMap.put( key, loadingCollectionEntry );
|
||||||
if ( loadingCollectionEntry.getInitializer() instanceof ArrayInitializer ) {
|
|
||||||
if ( arrayInitializers == null ) {
|
|
||||||
arrayInitializers = new ArrayList<>();
|
|
||||||
}
|
|
||||||
arrayInitializers.add( loadingCollectionEntry.getInitializer() );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue