Loader/Locker SPI proposal for 6.0

CollectionLoader.java

package org.hibernate.persister.exec.spi;

public interface CollectionLoader extends Loader {
	// todo (6.0) - any (additional) Options info?
	
	interface Options {
	}

	List load(Serializable key, SharedSessionContractImplementor session, Options options);
}

CollectionPersister.java

public interface CollectionPersister ... {
  ...

	/**
	 * @todo (6.0) what args?
	 */
	CollectionLoader getLoader();
}

EntityLocker.java

package org.hibernate.persister.exec.spi;

public interface EntityLocker {
	// todo (6.0) - any additional Options info?
	//		- "scope"?
	//		- LockMode-by-alias map?
	//		- other flags (skip-locked, etc)?
	//
	// ^^ ideally have LockOptions somehow expose this info - less instantiations

	interface Options {
		/**
		 * Obtain the query timeout, in milliseconds.  0 = no wait; -1 = wait indefinitely
		 */
		int getTimeout();
	}

	void lock(Serializable id, Object version, Object object, SharedSessionContractImplementor session, Options options);
}

EntityPersister.java

package org.hibernate.persister.entity.spi;

public interface EntityPersister ... {
  ...

	/**
	 * @todo (6.0) what args?
	 */
	SingleIdEntityLoader getSingleIdLoader();

	/**
	 * @todo (6.0) what args?
	 */
	MultiIdEntityLoader getMultiIdLoader();

	/**
	 * @todo (6.0) what args?
	 */
	SingleUniqueKeyEntityLoader getSingleUniqueKeyLoader();

	/**
	 * @todo (6.0) what args?
	 */
	EntityLocker getLocker();
}

Loader.java

package org.hibernate.persister.exec.spi;

public interface Loader {
}

MultiIdEntityLoader.java

package org.hibernate.persister.exec.spi;

public interface MultiIdEntityLoader extends Loader {
	interface Options {
	}

	List load(List ids, SharedSessionContractImplementor session, Options options);
}

QueryLoader.java

package org.hibernate.persister.exec.spi;

public interface QueryLoader extends Loader {
  interface Options {
	  // todo (6.0) parameters, etc?  Or pass those in as explicit args?
  }

  List load(SharedSessionContractImplementor session, Options options);
}

SingleIdEntityLoader.java

package org.hibernate.persister.exec.spi;

public interface SingleIdEntityLoader extends Loader {
	interface Options {
		/**
		 * The lock options for this load.  May be {@code null}.
		 */
		LockOptions getLockOptions();
	}

	Object load(Serializable id, SharedSessionContractImplementor session, Options options);
}

SingleUniqueKeyEntityLoader.java

package org.hibernate.persister.exec.spi;

public interface SingleUniqueKeyEntityLoader extends Loader {
	interface Options {
		/**
		 * The lock options for this load.  May be {@code null}.
		 */
		LockOptions getLockOptions();
	}

	Object load(Serializable uk, SharedSessionContractImplementor session, Options options);
}