some cleanups to AbstractEntityInitializer

it had some really long methods

hibernate-core/src/main/java/org/hibernate/engine/spi/NaturalIdResolutions.java

@@ -36,8 +36,7 @@ public interface NaturalIdResolutions {
 	 */
 	Object removeResolution(Object id, Object naturalId, EntityMappingType entityDescriptor);
 
-	void cacheResolutionFromLoad(
+	void cacheResolutionFromLoad(Object id, Object naturalId, EntityMappingType entityDescriptor);
-			Object id, Object naturalId, EntityMappingType entityDescriptor);
 
 	/**
 	 * Ensures that the necessary local cross-reference exists.  Specifically, this

hibernate-core/src/main/java/org/hibernate/metamodel/internal/EntityInstantiatorPojoStandard.java

@@ -40,15 +40,10 @@ public class EntityInstantiatorPojoStandard extends AbstractEntityInstantiatorPo
 			PersistentClass persistentClass,
 			JavaType<?> javaType) {
 		super( entityMetamodel, persistentClass, javaType );
-
 		this.entityMetamodel = entityMetamodel;
-		this.proxyInterface = persistentClass.getProxyInterface();
+		proxyInterface = persistentClass.getProxyInterface();
-
+		constructor = isAbstract() ? null : resolveConstructor( getMappedPojoClass() );
-		this.constructor = isAbstract()
+		applyBytecodeInterception = isPersistentAttributeInterceptableType( persistentClass.getMappedClass() );
-				? null
-				: resolveConstructor( getMappedPojoClass() );
-
-		this.applyBytecodeInterception = isPersistentAttributeInterceptableType( persistentClass.getMappedClass() );
 	}
 
 	protected static Constructor<?> resolveConstructor(Class<?> mappedPojoClass) {
@@ -57,10 +52,9 @@ public class EntityInstantiatorPojoStandard extends AbstractEntityInstantiatorPo
 		}
 		catch ( PropertyNotFoundException e ) {
 			LOG.noDefaultConstructor( mappedPojoClass.getName() );
-		}
-
 			return null;
 		}
+	}
 
 	@Override
 	public boolean canBeInstantiated() {
@@ -69,27 +63,26 @@ public class EntityInstantiatorPojoStandard extends AbstractEntityInstantiatorPo
 
 	@Override
 	protected Object applyInterception(Object entity) {
-		if ( !applyBytecodeInterception ) {
+		if ( applyBytecodeInterception ) {
-			return entity;
+			asPersistentAttributeInterceptable( entity )
-		}
+					.$$_hibernate_setInterceptor( new LazyAttributeLoadingInterceptor(
-
-		PersistentAttributeInterceptor interceptor = new LazyAttributeLoadingInterceptor(
 							entityMetamodel.getName(),
 							null,
 							entityMetamodel.getBytecodeEnhancementMetadata()
 									.getLazyAttributesMetadata()
 									.getLazyAttributeNames(),
 							null
-		);
+					) );
-		asPersistentAttributeInterceptable( entity ).$$_hibernate_setInterceptor( interceptor );
+		}
 		return entity;
+
 	}
 
 	@Override
 	public boolean isInstance(Object object, SessionFactoryImplementor sessionFactory) {
-		return super.isInstance( object, sessionFactory ) ||
+		return super.isInstance( object, sessionFactory )
 			//this one needed only for guessEntityMode()
-				( proxyInterface!=null && proxyInterface.isInstance(object) );
+			|| proxyInterface != null && proxyInterface.isInstance( object );
 	}
 
 	@Override