Skip to content

Commit 439d68a

Browse files
committed
JBIDE-29047: Extract the generic functionality from the experimental runtime plugin
- Inline method 'org.jboss.tools.hibernate.orm.runtime.exp.internal.util.NewFacadeFactory#createOneToOne(IPersistentClass)' * In method 'org.jboss.tools.hibernate.orm.runtime.exp.internal.ServiceImpl#newOneToOne(IPersistentClass)' - Remove unneeded test case 'org.jboss.tools.hibernate.orm.runtime.exp.internal.util.NewFacadeFactoryTest#testCreateOneToOne()' - Remove unused method 'org.jboss.tools.hibernate.orm.runtime.exp.internal.util.NewFacadeFactory#createOneToOne(IPersistentClass)' Signed-off-by: Koen Aers <[email protected]>
1 parent b30143d commit 439d68a

File tree

3 files changed

+3
-29
lines changed

3 files changed

+3
-29
lines changed

orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.exp/src/org/jboss/tools/hibernate/orm/runtime/exp/internal/ServiceImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,9 @@ public IValue newOneToMany(IPersistentClass persistentClass) {
312312

313313
@Override
314314
public IValue newOneToOne(IPersistentClass persistentClass) {
315-
return newFacadeFactory.createOneToOne(persistentClass);
315+
return (IValue)GenericFacadeFactory.createFacade(
316+
IValue.class,
317+
WrapperFactory.createOneToOneWrapper(((IFacade)persistentClass).getTarget()));
316318
}
317319

318320
@Override

orm/plugin/runtime/org.jboss.tools.hibernate.orm.runtime.exp/src/org/jboss/tools/hibernate/orm/runtime/exp/internal/util/NewFacadeFactory.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ public IPersistentClass createSpecialRootClass(IProperty property) {
5959
return null;
6060
}
6161

62-
public IValue createOneToOne(IPersistentClass persistentClass) {
63-
return (IValue)GenericFacadeFactory.createFacade(
64-
IValue.class,
65-
WrapperFactory.createOneToOneWrapper(((IFacade)persistentClass).getTarget()));
66-
}
67-
6862
public ITable createTable(String name) {
6963
return (ITable)GenericFacadeFactory.createFacade(
7064
ITable.class,

orm/test/runtime/org.jboss.tools.hibernate.orm.runtime.exp.test/src/org/jboss/tools/hibernate/orm/runtime/exp/internal/util/NewFacadeFactoryTest.java

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
import java.io.File;
99

1010
import org.hibernate.mapping.Component;
11-
import org.hibernate.mapping.OneToOne;
1211
import org.hibernate.mapping.PersistentClass;
1312
import org.hibernate.mapping.PrimitiveArray;
14-
import org.hibernate.mapping.RootClass;
1513
import org.hibernate.mapping.Set;
1614
import org.hibernate.mapping.SimpleValue;
1715
import org.hibernate.mapping.Table;
@@ -64,26 +62,6 @@ public void testCreateTable() {
6462
assertSame(((Wrapper)tableTarget).getWrappedObject(), tableTarget.getPrimaryKey().getTable());
6563
}
6664

67-
@Test
68-
public void testCreateOneToOne() {
69-
IPersistentClass rootClassFacade = (IPersistentClass)GenericFacadeFactory.createFacade(
70-
IPersistentClass.class,
71-
WrapperFactory.createRootClassWrapper());
72-
PersistentClass rootClass = (PersistentClass)((Wrapper)((IFacade)rootClassFacade).getTarget()).getWrappedObject();
73-
Table table = new Table("", "foo");
74-
((RootClass)rootClass).setTable(table);
75-
rootClass.setEntityName("bar");
76-
IValue oneToOneFacade =
77-
facadeFactory.createOneToOne(rootClassFacade);
78-
Object oneToOneWrapper = ((IFacade)oneToOneFacade).getTarget();
79-
assertNotNull(oneToOneWrapper);
80-
assertTrue(oneToOneWrapper instanceof Wrapper);
81-
Object wrappedOneToOne = ((Wrapper)oneToOneWrapper).getWrappedObject();
82-
assertTrue(wrappedOneToOne instanceof OneToOne);
83-
assertSame("bar", ((OneToOne)wrappedOneToOne).getEntityName());
84-
assertSame(table, ((OneToOne)wrappedOneToOne).getTable());
85-
}
86-
8765
@Test
8866
public void testCreatePrimitiveArray() {
8967
IPersistentClass rootClassFacade = (IPersistentClass)GenericFacadeFactory.createFacade(

0 commit comments

Comments
 (0)