Skip to content

HBX-2974: Refactor method 'PersistentClassWrapperFactory#createSpecialRootClassWrapper(PropertyWrapper)' #5048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
+115 −49
Merged

HBX-2974: Refactor method 'PersistentClassWrapperFactory#createSpecialRootClassWrapper(PropertyWrapper)' #5048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 106 additions & 32 deletions .../main/java/org/hibernate/tool/orm/jbt/internal/factory/PersistentClassWrapperFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
package org.hibernate.tool.orm.jbt.internal.factory;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.hibernate.AssertionFailure;
import org.hibernate.boot.spi.MetadataBuildingContext;
import org.hibernate.engine.OptimisticLockStyle;
import org.hibernate.mapping.Join;
import org.hibernate.mapping.JoinedSubclass;
import org.hibernate.mapping.KeyValue;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.RootClass;
import org.hibernate.mapping.SingleTableSubclass;
import org.hibernate.mapping.Subclass;
import org.hibernate.mapping.Table;
import org.hibernate.mapping.Value;
import org.hibernate.tool.orm.jbt.api.wrp.JoinWrapper;
import org.hibernate.tool.orm.jbt.api.wrp.PersistentClassWrapper;
import org.hibernate.tool.orm.jbt.api.wrp.PropertyWrapper;
import org.hibernate.tool.orm.jbt.api.wrp.TableWrapper;
import org.hibernate.tool.orm.jbt.api.wrp.ValueWrapper;
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;
Expand All @@ -43,15 +32,84 @@ public static Object createJoinedTableSubClassWrapper(PersistentClassWrapper per
return createPersistentClassWrapper(js);
}

public static Object createSpecialRootClassWrapper(PropertyWrapper propertyWrapper) {
Property p = (Property)propertyWrapper.getWrappedObject();
SpecialRootClass src = new SpecialRootClass(p);
return createPersistentClassWrapper(src);
public static PersistentClassWrapper createSpecialRootClassWrapper(PropertyWrapper propertyWrapper) {
return new SpecialRootClassWrapperImpl(propertyWrapper);
}

public static PersistentClassWrapper createPersistentClassWrapper(PersistentClass wrappedPersistentClass) {
return new PersistentClassWrapperImpl(wrappedPersistentClass);
}

private static class SpecialRootClassWrapperImpl extends PersistentClassWrapperImpl {

private final PropertyWrapper propertyWrapper;
private PropertyWrapper parentPropertyWrapper;

private SpecialRootClassWrapperImpl(PropertyWrapper propertyWrapper) {
super(new RootClass(getMetadataBuildingContext((Property)propertyWrapper.getWrappedObject())));
this.propertyWrapper = propertyWrapper;
initialize();
}

@Override
public PropertyWrapper getProperty() {
return propertyWrapper;
}

@Override
public PropertyWrapper getParentProperty() {
return parentPropertyWrapper;
}

@Override
public boolean isInstanceOfSpecialRootClass() {
return true;
}

@Override
public boolean isRootClass() {
return false;
}

private void initialize() {
Component component = getComponent();
if (component != null) {
setClassName(component.getComponentClassName());
setEntityName(component.getComponentClassName());
PersistentClass ownerClass = component.getOwner();
if (component.getParentProperty() != null) {
Property parentProperty = new Property();
parentProperty.setName(component.getParentProperty());
parentProperty.setPersistentClass(ownerClass);
parentPropertyWrapper = PropertyWrapperFactory.createPropertyWrapper(parentProperty);
}
for (Property property : component.getProperties()) {
if (property != null) {
addProperty(PropertyWrapperFactory.createPropertyWrapper(property));
}
}
}
}

private Component getComponent() {
Component result = null;
if (propertyWrapper != null) {
Value v = ((Property)propertyWrapper.getWrappedObject()).getValue();
if (v != null) {
if (v instanceof Wrapper) {
v = (Value)((Wrapper)v).getWrappedObject();
}
if (Collection.class.isAssignableFrom(v.getClass())) {
v = ((Collection)v).getElement();
}
if (v != null && Component.class.isAssignableFrom(v.getClass())) {
result = (Component)v;
}
}
}
return result;
}
}

private static class PersistentClassWrapperImpl
extends AbstractWrapper
Expand Down Expand Up @@ -122,8 +180,8 @@ public void setIdentifier(ValueWrapper value) {
if (!isInstanceOfRootClass()) {
throw new RuntimeException("Method 'setIdentifier(Value)' can only be called on RootClass instances");
} else {
((RootClass)persistentClass).setIdentifier(value == null ? null : (KeyValue)value.getWrappedObject());
}
((RootClass)persistentClass).setIdentifier(value == null ? null : (KeyValue)value.getWrappedObject());
}

@Override
Expand All @@ -136,7 +194,7 @@ public void setKey(ValueWrapper value) {

@Override
public boolean isInstanceOfSpecialRootClass() {
return SpecialRootClass.class.isAssignableFrom(persistentClass.getClass());
return false;
}

@Override
Expand Down Expand Up @@ -456,17 +514,33 @@ public List<PropertyWrapper> getPropertyClosure() {
}

private static int getOldCode(OptimisticLockStyle ols) {
switch (ols) {
case NONE:
return -1;
case VERSION:
return 0;
case DIRTY:
return 1;
case ALL:
return 2;
default:
throw new AssertionFailure("Unknown OptimisticLockStyle");
return switch (ols) {
case NONE -> -1;
case VERSION -> 0;
case DIRTY -> 1;
case ALL -> 2;
default -> throw new AssertionFailure("Unknown OptimisticLockStyle");
};
}

private static MetadataBuildingContext getMetadataBuildingContext(Property property) {
MetadataBuildingContext result = DummyMetadataBuildingContext.INSTANCE;
try {
if (property != null) {
PersistentClass pc = property.getPersistentClass();
if (pc != null) {
Field field = PersistentClass.class.getDeclaredField("metadataBuildingContext");
field.setAccessible(true);
result = (MetadataBuildingContext)field.get(pc);
}
}
} catch (NoSuchFieldException |
SecurityException |
IllegalArgumentException |
IllegalAccessException e) {
throw new RuntimeException("Problem while trying to retrieve MetadataBuildingContext from field", e);
}
return result;
}

}
18 changes: 5 additions & 13 deletions jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
package org.hibernate.tool.orm.jbt.api.factory;


import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.File;
import java.lang.reflect.Field;
import java.util.Properties;
Expand Down Expand Up @@ -68,6 +61,7 @@
import org.hibernate.tool.orm.jbt.api.wrp.TypeFactoryWrapper;
import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
import org.hibernate.tool.orm.jbt.internal.factory.ConfigurationWrapperFactory;
import org.hibernate.tool.orm.jbt.internal.factory.PersistentClassWrapperFactory;
import org.hibernate.tool.orm.jbt.internal.factory.RevengStrategyWrapperFactory;
import org.hibernate.tool.orm.jbt.internal.factory.TableWrapperFactory;
import org.hibernate.tool.orm.jbt.internal.util.ConfigurationMetadataDescriptor;
Expand All @@ -79,6 +73,8 @@
import org.hibernate.tool.orm.jbt.internal.util.SpecialRootClass;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.*;

public class WrapperFactoryTest {

@Test
Expand Down Expand Up @@ -236,12 +232,8 @@ public void testCreateSpecialRootClassWrapper() {
PropertyWrapper propertyWrapper = (PropertyWrapper)WrapperFactory.createPropertyWrapper();
Object specialRootClassWrapper = WrapperFactory.createSpecialRootClassWrapper(propertyWrapper);
assertNotNull(specialRootClassWrapper);
assertTrue(specialRootClassWrapper instanceof PersistentClassWrapper);
PersistentClass persistentClass = (PersistentClass)((PersistentClassWrapper)specialRootClassWrapper).getWrappedObject();
assertTrue(persistentClass instanceof SpecialRootClass);
assertSame(
((SpecialRootClass)persistentClass).getProperty(),
((Wrapper)propertyWrapper).getWrappedObject());
assertInstanceOf(PersistentClassWrapper.class, specialRootClassWrapper);
assertSame(propertyWrapper, ((PersistentClassWrapper)specialRootClassWrapper).getProperty());
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/PersistentClassWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ public void beforeEach() throws Exception {
property = PropertyWrapperFactory.createPropertyWrapper();
property.setPersistentClass(rootClassWrapper);
specialRootClassTarget = new SpecialRootClass((Property)property.getWrappedObject());
specialRootClassWrapper = PersistentClassWrapperFactory.createPersistentClassWrapper(specialRootClassTarget);
specialRootClassWrapper = PersistentClassWrapperFactory.createSpecialRootClassWrapper(property);
specialRootClassTarget = (PersistentClass)specialRootClassWrapper.getWrappedObject();
}

@Test
Expand All @@ -74,7 +75,7 @@ public void testConstruction() {
assertTrue(joinedSubclassTarget instanceof JoinedSubclass);
assertNotNull(specialRootClassWrapper);
assertNotNull(specialRootClassTarget);
assertTrue(specialRootClassTarget instanceof SpecialRootClass);
assertTrue(specialRootClassTarget instanceof RootClass);
}

@Test
Expand Down Expand Up @@ -655,8 +656,7 @@ public void testGetParentProperty() {
Property property = (Property)propertyWrapper.getWrappedObject();
property.setValue(component);
property.setPersistentClass(pc);
SpecialRootClass src = new SpecialRootClass(property);
specialRootClassWrapper = PersistentClassWrapperFactory.createPersistentClassWrapper(src);
specialRootClassWrapper = PersistentClassWrapperFactory.createSpecialRootClassWrapper(propertyWrapper);
PropertyWrapper parentProperty = specialRootClassWrapper.getParentProperty();
assertNotNull(parentProperty);
assertEquals("foo", parentProperty.getName());
Expand Down