HHH-10664 - Prep 6.0 feature branch - merge hibernate-entitymanager into hibernate-core (first sucessful full compile of consolidated hibernate-core)

Author: sebersole

documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc

@@ -61,7 +61,7 @@ The previous tutorials used the Hibernate native APIs.  This tutorial uses the J
 [source, JAVA]
 ----
 protected void setUp() throws Exception {
-	entityManagerFactory = Persistence.createEntityManagerFactory( "org.hibernate.tutorial.jpa" );
+	sessionFactory = Persistence.createEntityManagerFactory( "org.hibernate.tutorial.jpa" );
 }
 ----
 ====
@@ -74,7 +74,7 @@ Notice again that the persistence unit name is `org.hibernate.tutorial.jpa`, whi
 ====
 [source, JAVA]
 ----
-EntityManager entityManager = entityManagerFactory.createEntityManager();
+EntityManager entityManager = sessionFactory.createEntityManager();
 entityManager.getTransaction().begin();
 entityManager.persist( new Event( "Our very first event!", new Date() ) );
 entityManager.persist( new Event( "A follow up event", new Date() ) );
@@ -92,7 +92,7 @@ is used instead of the `org.hibernate.Session` interface.  JPA calls this operat
 ====
 [source, JAVA]
 ----
-entityManager = entityManagerFactory.createEntityManager();
+entityManager = sessionFactory.createEntityManager();
 entityManager.getTransaction().begin();
 List<Event> result = entityManager.createQuery( "from Event", Event.class ).getResultList();
 for ( Event event : result ) {

documentation/src/main/docbook/manual-old/en-US/content/bootstrap.xml

@@ -916,7 +916,7 @@
             <listitem>
                 <para>
                     <literal>hibernate.query.plan_parameter_metadata_max_size</literal> - Controls the maximum number of
-                    <interfacename>org.hibernate.engine.query.spi.ParameterMetadata</interfacename> instances Hibernate
+                    <interfacename>org.hibernate.query.internal.ParameterMetadata</interfacename> instances Hibernate
                     will maintain in its QueryPlanCache.  The default is 128.
                 </para>
             </listitem>

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java

@@ -8,7 +8,6 @@
 
 import java.sql.SQLException;
 
-import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.log.ConnectionPoolingLogger;
 
 import org.jboss.logging.annotations.Cause;
@@ -23,7 +22,7 @@
  * The jboss-logging {@link MessageLogger} for the hibernate-c3p0 module.  It reserves message ids ranging from
  * 10001 to 15000 inclusively.
  * <p/>
- * New messages must be added after the last message defined to ensure message codes are unique.
+ * New messages must be added afterQuery the last message defined to ensure message codes are unique.
  */
 @MessageLogger(projectCode = "HHH")
 public interface C3P0MessageLogger extends ConnectionPoolingLogger {

hibernate-core/hibernate-core.gradle

@@ -30,6 +30,7 @@ dependencies {
     provided( libraries.jacc )
     provided( libraries.validation )
     provided( libraries.ant )
+    provided( "javax.enterprise:cdi-api:1.1-PFD" )
 
     testCompile( project(':hibernate-testing') )
     testCompile( libraries.validation )

hibernate-core/src/main/java/org/hibernate/BasicQueryContract.java

@@ -12,18 +12,38 @@
  * Defines the aspects of query definition that apply to all forms of querying.
  *
  * @author Steve Ebersole
+ *
+ * @deprecated (since 5.2) use {@link org.hibernate.query.BasicQueryContract} instead.
  */
+@Deprecated
 public interface BasicQueryContract {
+	/**
+	 * (Re)set the current FlushMode in effect for this query.
+	 *
+	 * @param flushMode The new FlushMode to use.
+	 *
+	 * @return {@code this}, for method chaining
+	 *
+	 * @see #getHibernateFlushMode()
+	 *
+	 * @deprecated (since 5.2) use {@link #setHibernateFlushMode} instead
+	 */
+	@Deprecated
+	default org.hibernate.query.BasicQueryContract setFlushMode(FlushMode flushMode) {
+		setHibernateFlushMode( flushMode );
+		return (org.hibernate.query.BasicQueryContract) this;
+	}
+
 	/**
 	 * Obtain the FlushMode in effect for this query.  By default, the query inherits the FlushMode of the Session
-	 * from which is originates.
+	 * from which it originates.
 	 *
 	 * @return The query FlushMode.
 	 *
 	 * @see Session#getFlushMode()
 	 * @see FlushMode
 	 */
-	public FlushMode getFlushMode();
+	FlushMode getHibernateFlushMode();
 
 	/**
 	 * (Re)set the current FlushMode in effect for this query.
@@ -32,9 +52,9 @@ public interface BasicQueryContract {
 	 *
 	 * @return {@code this}, for method chaining
 	 *
-	 * @see #getFlushMode()
+	 * @see #getHibernateFlushMode()
 	 */
-	public BasicQueryContract setFlushMode(FlushMode flushMode);
+	org.hibernate.query.BasicQueryContract setHibernateFlushMode(FlushMode flushMode);
 
 	/**
 	 * Obtain the CacheMode in effect for this query.  By default, the query inherits the CacheMode of the Session
@@ -48,7 +68,7 @@ public interface BasicQueryContract {
 	 * @see Session#getCacheMode()
 	 * @see CacheMode
 	 */
-	public CacheMode getCacheMode();
+	CacheMode getCacheMode();
 
 	/**
 	 * (Re)set the current CacheMode in effect for this query.
@@ -59,7 +79,7 @@ public interface BasicQueryContract {
 	 *
 	 * @see #getCacheMode()
 	 */
-	public BasicQueryContract setCacheMode(CacheMode cacheMode);
+	org.hibernate.query.BasicQueryContract setCacheMode(CacheMode cacheMode);
 
 	/**
 	 * Are the results of this query eligible for second level query caching?  This is different that second level
@@ -73,7 +93,7 @@ public interface BasicQueryContract {
 	 *
 	 * @see org.hibernate.cfg.AvailableSettings#USE_QUERY_CACHE
 	 */
-	public boolean isCacheable();
+	boolean isCacheable();
 
 	/**
 	 * Enable/disable second level query (result) caching for this query.
@@ -84,7 +104,7 @@ public interface BasicQueryContract {
 	 *
 	 * @see #isCacheable
 	 */
-	public BasicQueryContract setCacheable(boolean cacheable);
+	org.hibernate.query.BasicQueryContract setCacheable(boolean cacheable);
 
 	/**
 	 * Obtain the name of the second level query cache region in which query results will be stored (if they are
@@ -94,7 +114,7 @@ public interface BasicQueryContract {
 	 * @return The specified cache region name into which query results should be placed; {@code null} indicates
 	 * the default region.
 	 */
-	public String getCacheRegion();
+	String getCacheRegion();
 
 	/**
 	 * Set the name of the cache region where query results should be cached (if cached at all).
@@ -106,7 +126,7 @@ public interface BasicQueryContract {
 	 *
 	 * @see #getCacheRegion()
 	 */
-	public BasicQueryContract setCacheRegion(String cacheRegion);
+	org.hibernate.query.BasicQueryContract setCacheRegion(String cacheRegion);
 
 	/**
 	 * Obtain the query timeout <b>in seconds</b>.  This value is eventually passed along to the JDBC query via
@@ -117,7 +137,7 @@ public interface BasicQueryContract {
 	 * @see java.sql.Statement#getQueryTimeout()
 	 * @see java.sql.Statement#setQueryTimeout(int)
 	 */
-	public Integer getTimeout();
+	Integer getTimeout();
 
 	/**
 	 * Set the query timeout <b>in seconds</b>.
@@ -131,7 +151,7 @@ public interface BasicQueryContract {
 	 *
 	 * @see #getTimeout()
 	 */
-	public BasicQueryContract setTimeout(int timeout);
+	org.hibernate.query.BasicQueryContract setTimeout(int timeout);
 
 	/**
 	 * Obtain the JDBC fetch size hint in effect for this query.  This value is eventually passed along to the JDBC
@@ -146,7 +166,7 @@ public interface BasicQueryContract {
 	 * @see java.sql.Statement#getFetchSize()
 	 * @see java.sql.Statement#setFetchSize(int)
 	 */
-	public Integer getFetchSize();
+	Integer getFetchSize();
 
 	/**
 	 * Sets a JDBC fetch size hint for the query.
@@ -157,22 +177,23 @@ public interface BasicQueryContract {
 	 *
 	 * @see #getFetchSize()
 	 */
-	public BasicQueryContract setFetchSize(int fetchSize);
+	org.hibernate.query.BasicQueryContract setFetchSize(int fetchSize);
 
 	/**
 	 * Should entities and proxies loaded by this Query be put in read-only mode? If the
 	 * read-only/modifiable setting was not initialized, then the default
 	 * read-only/modifiable setting for the persistence context is returned instead.
-	 * @see Query#setReadOnly(boolean)
+	 *
+	 * @see #setReadOnly(boolean)
 	 * @see org.hibernate.engine.spi.PersistenceContext#isDefaultReadOnly()
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies returned by the
-	 * query that existed in the session before the query was executed.
+	 * query that existed in the session beforeQuery the query was executed.
 	 *
-	 * @return true, entities and proxies loaded by the query will be put in read-only mode
-	 *         false, entities and proxies loaded by the query will be put in modifiable mode
+	 * @return {@code true} if the entities and proxies loaded by the query will be put
+	 * in read-only mode; {@code false} otherwise (they will be modifiable)
 	 */
-	public boolean isReadOnly();
+	boolean isReadOnly();
 
 	/**
 	 * Set the read-only/modifiable mode for entities and proxies
@@ -183,7 +204,7 @@ public interface BasicQueryContract {
 	 * To set the default read-only/modifiable setting used for
 	 * entities and proxies that are loaded into the session:
 	 * @see org.hibernate.engine.spi.PersistenceContext#setDefaultReadOnly(boolean)
-	 * @see org.hibernate.Session#setDefaultReadOnly(boolean)
+	 * @see Session#setDefaultReadOnly(boolean)
 	 *
 	 * Read-only entities are not dirty-checked and snapshots of persistent
 	 * state are not maintained. Read-only entities can be modified, but
@@ -194,19 +215,23 @@ public interface BasicQueryContract {
 	 * proxy has, regardless of the session's current setting.
 	 *
 	 * The read-only/modifiable setting has no impact on entities/proxies
-	 * returned by the query that existed in the session before the query was executed.
+	 * returned by the query that existed in the session beforeQuery the query was executed.
 	 *
 	 * @return {@code this}, for method chaining
 	 *
-	 * @param readOnly true, entities and proxies loaded by the query will be put in read-only mode
-	 *                 false, entities and proxies loaded by the query will be put in modifiable mode
+	 * @param readOnly {@code true} indicates that entities and proxies loaded by the query
+	 * are to be put in read-only mode; {@code false} indicates that entities and proxies
+	 * loaded by the query will be put in modifiable mode
 	 */
-	public BasicQueryContract setReadOnly(boolean readOnly);
+	org.hibernate.query.BasicQueryContract setReadOnly(boolean readOnly);
 
 	/**
 	 * Return the Hibernate types of the query results.
 	 *
 	 * @return an array of types
+	 *
+	 * @deprecated (since 5.2) with no replacement; to be removed in 6.0
 	 */
-	public Type[] getReturnTypes();
+	@Deprecated
+	Type[] getReturnTypes();
 }