HHH-14509 : Git master -> main branch renaming

Author: sebersole

.github/workflows/contributor-build.yml

@@ -9,11 +9,11 @@ name: Hibernate ORM build
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
       - 'wip/6.0'
   pull_request:
     branches:
-      - 'master'
+      - 'main'
       - 'wip/6.0'
 jobs:
   build:

CONTRIBUTING.md

@@ -62,8 +62,8 @@ although this is more of a mnemonic strategy than a hard-and-fast rule - but doi
 
 _If there is not already a JIRA issue covering the work you want to do, create one._
 
-Assuming you will be working from the master branch and working
-on the JIRA HHH-123 : `git checkout -b HHH-123 master`
+Assuming you will be working from the `main` branch and working
+on the JIRA HHH-123 : `git checkout -b HHH-123 main`
 
 
 ## Code

README.md

@@ -8,7 +8,7 @@ It also provides an implementation of the JPA specification, which is the standa
 
 This is the repository of its source code: see [Hibernate.org](http://hibernate.org/orm/) for additional information.
 
-[![Build Status](http://ci.hibernate.org/job/hibernate-orm-master-h2-main/badge/icon)](http://ci.hibernate.org/job/hibernate-orm-master-h2-main/)
+[![Build Status](http://ci.hibernate.org/job/hibernate-orm-main-h2-main/badge/icon)](http://ci.hibernate.org/job/hibernate-orm-main-h2-main/)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/hibernate/hibernate-orm.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hibernate/hibernate-orm/context:java)
 
 Building from sources

etc/hibernate.properties

@@ -190,7 +190,7 @@ hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate
 
 #hibernate.dialect org.hibernate.dialect.InterbaseDialect
 #hibernate.connection.username sysdba
-#hibernate.connection.password masterkey
+#hibernate.connection.password thekey
 
 ## DO NOT specify hibernate.connection.sqlDialect
 

etc/hibernate.properties.template

@@ -169,7 +169,7 @@ hibernate.connection.url @DB_URL@
 
 #hibernate.dialect org.hibernate.dialect.InterbaseDialect
 #hibernate.connection.username sysdba
-#hibernate.connection.password masterkey
+#hibernate.connection.password thepass
 
 ## DO NOT specify hibernate.connection.sqlDialect
 

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -1669,7 +1669,7 @@ void cannotResolveNonNullableTransientDependencies(
 	)
 	void applyingExplicitDiscriminatorColumnForJoined(String className, String overrideSetting);
 
-	// 458-466 reserved for use by master (ORM 5.0.0)
+	// 458-466 reserved for use by main branch (ORM 5.0.0)
 
 	@LogMessage(level = DEBUG)
 	@Message(value = "Creating pooled optimizer (lo) with [incrementSize=%s; returnClass=%s]", id = 467)

hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java

@@ -26,7 +26,7 @@ public class FormalLastName {
 	@Embedded
 	private LastName lastName;
 
-	private String designation; /* Mr/Mrs/Master */
+	private String designation; /* Mr/Mrs */
 
 	public Integer getId() {
 		return id;

hibernate-core/src/test/java/org/hibernate/test/fileimport/Dog.java

@@ -12,7 +12,7 @@
  */
 public class Dog {
 	private Integer id;
-	private Human master;
+	private Human owner;
 
 	public Integer getId() {
 		return id;
@@ -22,11 +22,11 @@ public void setId(Integer id) {
 		this.id = id;
 	}
 
-	public Human getMaster() {
-		return master;
+	public Human getOwner() {
+		return owner;
 	}
 
-	public void setMaster(Human master) {
-		this.master = master;
+	public void setOwner(Human owner) {
+		this.owner = owner;
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java

@@ -21,7 +21,7 @@ public class AnnotatedFormWithBeanValidationNotNullTest extends BaseUnitTestCase
 	@TestForIssue( jiraKey = "HHH-8167" )
 	public void testAnnotatedFormWithBeanValidationNotNull() {
 		Configuration cfg = new Configuration();
-		cfg.addAnnotatedClass( AnnotatedMaster.class ).addAnnotatedClass( AnnotatedDetail.class );
+		cfg.addAnnotatedClass( AnnotatedRoot.class ).addAnnotatedClass( AnnotatedDetail.class );
 		cfg.buildSessionFactory().close();
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java renamed to hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedRoot.java

@@ -22,7 +22,7 @@
  * @author Steve Ebersole
  */
 @Entity
-public class AnnotatedMaster {
+public class AnnotatedRoot {
 	@Id
 	private Integer id;
 	private String name;

hibernate-core/src/test/java/org/hibernate/test/formulajoin/Detail.java

@@ -14,7 +14,7 @@
  */
 public class Detail implements Serializable {
 	private Long id;
-	private Master master;
+	private Root root;
 	private int version;
 	private String details;
 	private boolean currentVersion;
@@ -37,11 +37,11 @@ public Long getId() {
 	public void setId(Long id) {
 		this.id = id;
 	}
-	public Master getMaster() {
-		return master;
+	public Root getRoot() {
+		return root;
 	}
-	public void setMaster(Master master) {
-		this.master = master;
+	public void setRoot(Root root) {
+		this.root = root;
 	}
 	public int getVersion() {
 		return version;

hibernate-core/src/test/java/org/hibernate/test/formulajoin/FormulaJoinTest.java

@@ -24,27 +24,27 @@
  */
 public class FormulaJoinTest extends BaseCoreFunctionalTestCase {
 	public String[] getMappings() {
-		return new String[] { "formulajoin/Master.hbm.xml" };
+		return new String[] { "formulajoin/Root.hbm.xml" };
 	}
 
 	@Test
 	public void testFormulaJoin() {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
-		Master master = new Master();
-		master.setName("master 1");
+		Root root = new Root();
+		root.setName("root 1");
 		Detail current = new Detail();
 		current.setCurrentVersion(true);
 		current.setVersion(2);
-		current.setDetails("details of master 1 blah blah");
-		current.setMaster(master);
-		master.setDetail(current);
+		current.setDetails("details of root 1 blah blah");
+		current.setRoot( root );
+		root.setDetail(current);
 		Detail past = new Detail();
 		past.setCurrentVersion(false);
 		past.setVersion(1);
-		past.setDetails("old details of master 1 yada yada");
-		past.setMaster(master);
-		s.persist(master);
+		past.setDetails("old details of root 1 yada yada");
+		past.setRoot( root );
+		s.persist( root );
 		s.persist(past);
 		s.persist(current);
 		tx.commit();
@@ -54,42 +54,42 @@ public void testFormulaJoin() {
 
 		s = openSession();
 		tx = s.beginTransaction();
-		List l = s.createQuery("from Master m left join m.detail d").list();
+		List l = s.createQuery("from Root m left join m.detail d").list();
 		assertEquals( l.size(), 1 );
 		tx.commit();
 		s.close();
 
 		s = openSession();
 		tx = s.beginTransaction();
-		l = s.createQuery("from Master m left join fetch m.detail").list();
+		l = s.createQuery("from Root m left join fetch m.detail").list();
 		assertEquals( l.size(), 1 );
-		Master m = (Master) l.get(0);
-		assertEquals( "master 1", m.getDetail().getMaster().getName() );
-		assertTrue( m==m.getDetail().getMaster() );
+		Root m = (Root) l.get(0);
+		assertEquals( "root 1", m.getDetail().getRoot().getName() );
+		assertTrue( m==m.getDetail().getRoot() );
 		tx.commit();
 		s.close();
 
 		s = openSession();
 		tx = s.beginTransaction();
-		l = s.createQuery("from Master m join fetch m.detail").list();
+		l = s.createQuery("from Root m join fetch m.detail").list();
 		assertEquals( l.size(), 1 );
 		tx.commit();
 		s.close();
 
 		s = openSession();
 		tx = s.beginTransaction();
-		l = s.createQuery("from Detail d join fetch d.currentMaster.master").list();
+		l = s.createQuery("from Detail d join fetch d.currentRoot.root").list();
 		assertEquals( l.size(), 2 );
 		tx.commit();
 		s.close();
 
 		s = openSession();
 		tx = s.beginTransaction();
-		l = s.createQuery("from Detail d join fetch d.currentMaster.master m join fetch m.detail").list();
+		l = s.createQuery("from Detail d join fetch d.currentRoot.root m join fetch m.detail").list();
 		assertEquals( l.size(), 2 );
 
 		s.createQuery("delete from Detail").executeUpdate();
-		s.createQuery("delete from Master").executeUpdate();
+		s.createQuery("delete from Root").executeUpdate();
 
 		tx.commit();
 		s.close();

hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.hbm.xml renamed to hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.hbm.xml

@@ -18,7 +18,7 @@
 
 <hibernate-mapping package="org.hibernate.test.formulajoin">
 
-	<class name="Master" table="t_masters">
+	<class name="Root" table="t_roots">
 
 		<id name="id">
 			<generator class="increment"/>
@@ -30,7 +30,7 @@
 			update="false"/>
 
 		<many-to-one name="detail" 
-				property-ref="currentMaster" 
+				property-ref="currentRoot"
 				insert="false"
 				update="false">
 			<column name="id"/>
@@ -53,13 +53,13 @@
 		<property name="version" update="false">
 			<column name="version" 
 				not-null="true" 
-				unique-key="masterVersion"/>
+				unique-key="rootVersion"/>
 		</property>
 
-		<properties name="currentMaster">
-			<many-to-one name="master">
-				<column name="cur_master" 
-					unique-key="masterVersion" 
+		<properties name="currentRoot">
+			<many-to-one name="root">
+				<column name="cur_root"
+					unique-key="rootVersion"
 					not-null="true"/>
 			</many-to-one>
 			<property name="currentVersion" 

hibernate-core/src/test/java/org/hibernate/test/formulajoin/Master.java renamed to hibernate-core/src/test/java/org/hibernate/test/formulajoin/Root.java

@@ -4,15 +4,14 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-
-//$Id: Master.java 4602 2004-09-26 11:42:47Z oneovthafew $
 package org.hibernate.test.formulajoin;
+
 import java.io.Serializable;
 
 /**
  * @author Gavin King
  */
-public class Master implements Serializable {
+public class Root implements Serializable {
 	private Long id;
 	private String name;
 	private Detail detail;

hibernate-core/src/test/java/org/hibernate/test/hql/DeleteQuerySubqueryReferencingTargetPropertyTest.java

@@ -21,45 +21,45 @@ public class DeleteQuerySubqueryReferencingTargetPropertyTest extends BaseEntity
 
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { Master.class, Detail.class };
+		return new Class<?>[] { Root.class, Detail.class };
 	}
 
 	@Test
 	public void testSubQueryReferencingTargetProperty() {
 		// prepare
 		doInJPA( this::entityManagerFactory, entityManager -> {
-			Master m1 = new Master();
+			Root m1 = new Root();
 			entityManager.persist( m1 );
 			Detail d11 = new Detail( m1 );
 			entityManager.persist( d11 );
 			Detail d12 = new Detail( m1 );
 			entityManager.persist( d12 );
 
-			Master m2 = new Master();
+			Root m2 = new Root();
 			entityManager.persist( m2 );
 		} );
 
 		doInJPA( this::entityManagerFactory, entityManager -> {
-			// depending on the generated ids above this delete removes all masters or nothing
-			// removal of all masters results in foreign key constraint violation
-			// removal of nothing is incorrect since 2nd master does not have any details
+			// depending on the generated ids above this delete removes all Roots or nothing
+			// removal of all Roots results in foreign key constraint violation
+			// removal of nothing is incorrect since 2nd Root does not have any details
 
 			// DO NOT CHANGE this query: it used to trigger a very specific bug caused
 			// by the alias not being added to the generated query
-			String d = "delete from Master m where not exists (select d from Detail d where d.master=m)";
+			String d = "delete from Root m where not exists (select d from Detail d where d.root=m)";
 			Query del = entityManager.createQuery( d );
 			del.executeUpdate();
 
-			// so check for exactly one master after deletion
+			// so check for exactly one Root after deletion
 			CriteriaBuilder builder = entityManager.getCriteriaBuilder();
-			CriteriaQuery<Master> query = builder.createQuery( Master.class );
-			query.select( query.from( Master.class ) );
+			CriteriaQuery<Root> query = builder.createQuery( Root.class );
+			query.select( query.from( Root.class ) );
 			Assert.assertEquals( 1, entityManager.createQuery( query ).getResultList().size() );
 		} );
 	}
 
-	@Entity(name = "Master")
-	public static class Master {
+	@Entity(name = "Root")
+	public static class Root {
 		@Id
 		@GeneratedValue
 		private Integer id;
@@ -72,10 +72,10 @@ public static class Detail {
 		private Integer id;
 
 		@ManyToOne(optional = false)
-		private Master master;
+		private Root root;
 
-		public Detail(Master master) {
-			this.master = master;
+		public Detail(Root root) {
+			this.root = root;
 		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/hql/HQLTest.java

@@ -445,8 +445,8 @@ public void testMultipleElementAccessorOperators() throws Exception {
 	public void testKeyManyToOneJoin() {
 		//TODO: new parser generates unnecessary joins (though the query results are correct)
 		assertTranslation( "from Order o left join fetch o.lineItems li left join fetch li.product p" );
-		assertTranslation( "from Outer o where o.id.master.id.sup.dudu is not null" );
-		assertTranslation( "from Outer o where o.id.master.id.sup.dudu is not null" );
+		assertTranslation( "from Outer o where o.id.root.id.sup.dudu is not null" );
+		assertTranslation( "from Outer o where o.id.root.id.sup.dudu is not null" );
 	}
 
 	@Test
@@ -670,7 +670,7 @@ public void testFetchList() throws Exception {
 
 	@Test
 	public void testCollectionFetchWithExplicitThetaJoin() {
-		assertTranslation( "select m from Master m1, Master m left join fetch m.details where m.name=m1.name" );
+		assertTranslation( "select m from Root m1, Root m left join fetch m.details where m.name=m1.name" );
 	}
 
 	@Test