HBX-2789: Review WrapperFactory class and create only new Wrapper intances

  - Modify method 'org.hibernate.tool.orm.jbt.internal.factory.RevengStrategyWrapperFactory#createRevengStrategyWrapper(Object..)' to use a Wrapper argument
  - Adapt test 'org.hibernate.tool.orm.jbt.api.factory.WrapperFactoryTest#testCreateRevengStrategyWrapper()'

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

Author: koentsje

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

@@ -7,6 +7,7 @@
 import org.hibernate.tool.internal.reveng.strategy.DefaultStrategy;
 import org.hibernate.tool.orm.jbt.api.wrp.RevengSettingsWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.RevengStrategyWrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.Wrapper;
 import org.hibernate.tool.orm.jbt.internal.wrp.AbstractWrapper;
 import org.hibernate.tool.orm.jbt.util.ReflectUtil;
 
@@ -17,7 +18,7 @@ public static RevengStrategyWrapper createRevengStrategyWrapper(Object...objects
 		if (objects.length == 0) {
 			wrappedRevengStrategy = createDefaultStrategy();
 		} else if (objects.length == 2) {
-			wrappedRevengStrategy = createDelegatingStrategy((String)objects[0], (RevengStrategy)objects[1]);
+			wrappedRevengStrategy = createDelegatingStrategy((String)objects[0], (RevengStrategy)((Wrapper)objects[1]).getWrappedObject());
 		} else {
 			throw new RuntimeException("RevengStrategyWrapperFactory#create has either 0 or 2 arguments");
 		}

jbt/src/test/java/org/hibernate/tool/orm/jbt/api/factory/WrapperFactoryTest.java

@@ -135,17 +135,17 @@ public void testCreateRevengStrategyWrapper() throws Exception {
 		assertNotNull(reverseEngineeringStrategyWrapper);
 		assertTrue(reverseEngineeringStrategyWrapper instanceof Wrapper);
 		assertTrue(((Wrapper)reverseEngineeringStrategyWrapper).getWrappedObject() instanceof DefaultStrategy);
-		reverseEngineeringStrategyWrapper = null;
-		assertNull(reverseEngineeringStrategyWrapper);
-		RevengStrategy delegate = new TestRevengStrategy();
+		RevengStrategyWrapper delegate = (RevengStrategyWrapper)reverseEngineeringStrategyWrapper;
 		reverseEngineeringStrategyWrapper = WrapperFactory
 				.createRevengStrategyWrapper(
 						TestDelegatingStrategy.class.getName(), 
 						delegate);
 		assertNotNull(reverseEngineeringStrategyWrapper);
 		assertTrue(reverseEngineeringStrategyWrapper instanceof Wrapper);
 		assertTrue(((Wrapper)reverseEngineeringStrategyWrapper).getWrappedObject() instanceof TestDelegatingStrategy);
-		assertSame(delegateField.get(((Wrapper)reverseEngineeringStrategyWrapper).getWrappedObject()), delegate);
+		assertSame(
+				delegateField.get(((Wrapper)reverseEngineeringStrategyWrapper).getWrappedObject()), 
+				delegate.getWrappedObject());
 	}
 
 	@Test