HBX-2974: Remove uses of class 'org.hibernate.tool.orm.jbt.internal.util.SpecialRootClass'

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/PersistentClassWrapperFactory.java

@@ -11,7 +11,6 @@
 import org.hibernate.mapping.*;
 import org.hibernate.tool.orm.jbt.api.wrp.*;
 import org.hibernate.tool.orm.jbt.internal.util.DummyMetadataBuildingContext;
-import org.hibernate.tool.orm.jbt.internal.util.SpecialRootClass;
 import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 
 public class PersistentClassWrapperFactory {
@@ -153,12 +152,7 @@ public boolean isInstanceOfJoinedSubclass() {
 
 		@Override
 		public PropertyWrapper getProperty() {
-			if (!isInstanceOfSpecialRootClass()) {
-				throw new RuntimeException("getProperty() is only allowed on SpecialRootClass");
-			} else {
-				Property p = ((SpecialRootClass)persistentClass).getProperty();
-				return p == null ? null : PropertyWrapperFactory.createPropertyWrapper(p);
-			}
+			throw new RuntimeException("getProperty() is only allowed on SpecialRootClass");
 		}
 
 		@Override
@@ -168,8 +162,6 @@ public void setTable(TableWrapper tableWrapper) {
 				((RootClass)persistentClass).setTable(table);
 			} else if (isInstanceOfJoinedSubclass()) {
 				((JoinedSubclass)persistentClass).setTable(table);
-			} else if (isInstanceOfSpecialRootClass()) {
-				((SpecialRootClass)persistentClass).setTable(table);
 			} else {
 				throw new RuntimeException("Method 'setTable(Table)' is not supported.");
 			}
@@ -199,12 +191,7 @@ public boolean isInstanceOfSpecialRootClass() {
 
 		@Override
 		public PropertyWrapper getParentProperty() {
-			if (!isInstanceOfSpecialRootClass()) {
-				throw new RuntimeException("getParentProperty() is only allowed on SpecialRootClass");
-			} else {
-				Property p = ((SpecialRootClass)persistentClass).getParentProperty();
-				return p == null ? null : PropertyWrapperFactory.createPropertyWrapper(p);
-			}
+			throw new RuntimeException("getParentProperty() is only allowed on SpecialRootClass");
 		}
 
 		@Override

jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/PersistentClassWrapperTest.java

@@ -30,7 +30,6 @@
 import org.hibernate.tool.orm.jbt.internal.factory.TableWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.factory.ValueWrapperFactory;
 import org.hibernate.tool.orm.jbt.internal.util.DummyMetadataBuildingContext;
-import org.hibernate.tool.orm.jbt.internal.util.SpecialRootClass;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -57,7 +56,6 @@ public void beforeEach() throws Exception {
 		joinedSubclassWrapper = PersistentClassWrapperFactory.createPersistentClassWrapper(joinedSubclassTarget);
 		property = PropertyWrapperFactory.createPropertyWrapper();
 		property.setPersistentClass(rootClassWrapper);
-		specialRootClassTarget = new SpecialRootClass((Property)property.getWrappedObject());
 		specialRootClassWrapper = PersistentClassWrapperFactory.createSpecialRootClassWrapper(property);
 		specialRootClassTarget = (PersistentClass)specialRootClassWrapper.getWrappedObject();
 	}