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

  - Change the returned class of the methods of interface 'org.hibernate.tool.orm.jbt.api.wrp.RevengSettingsWrapper' to return in instance of 'org.hibernate.tool.orm.jbt.api.wrp.RevengSettingsWrapper'
  - Adapt implementation class 'org.hibernate.tool.orm.jbt.internal.factory.RevengSettingsWrapperFactory.RevengSettingsWrapperImpl' accordingly
  - Add an additional assertion to verify the above in the test methods of test class 'org.hibernate.tool.orm.jbt.internal.factory.RevengSettingsWrapperFactoryTest'

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

Author: koentsje

jbt/src/main/java/org/hibernate/tool/orm/jbt/api/wrp/RevengSettingsWrapper.java

@@ -2,9 +2,9 @@
 
 public interface RevengSettingsWrapper extends Wrapper {
 
-	void setDefaultPackageName(String s);
-	void setDetectManyToMany(boolean b);
-	void setDetectOneToOne(boolean b);
-	void setDetectOptimisticLock(boolean b);
+	RevengSettingsWrapper setDefaultPackageName(String s);
+	RevengSettingsWrapper setDetectManyToMany(boolean b);
+	RevengSettingsWrapper setDetectOneToOne(boolean b);
+	RevengSettingsWrapper setDetectOptimisticLock(boolean b);
 
 }

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

@@ -33,23 +33,27 @@ public RevengSettings getWrappedObject() {
 		}
 
 		@Override 
-		public void setDefaultPackageName(String s) { 
+		public RevengSettingsWrapper setDefaultPackageName(String s) { 
 			revengSettings.setDefaultPackageName(s); 
+			return this;
 		}
 
 		@Override 
-		public void setDetectManyToMany(boolean b) { 
+		public RevengSettingsWrapper setDetectManyToMany(boolean b) { 
 			revengSettings.setDetectManyToMany(b); 
+			return this;
 		}
 
 		@Override 
-		public void setDetectOneToOne(boolean b) { 
+		public RevengSettingsWrapper setDetectOneToOne(boolean b) { 
 			revengSettings.setDetectOneToOne(b); 
+			return this;
 		}
 
 		@Override 
-		public void setDetectOptimisticLock(boolean b) { 
+		public RevengSettingsWrapper setDetectOptimisticLock(boolean b) { 
 			revengSettings.setDetectOptimisticLock(b); 
+			return this;
 		}
 
 	}

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

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.hibernate.tool.api.reveng.RevengSettings;
@@ -31,28 +32,28 @@ public void testConstruction() {
 	@Test
 	public void testSetDefaultPackageName() {
 		assertEquals("", wrappedRevengSettings.getDefaultPackageName());
-		revengSettingsWrapper.setDefaultPackageName("foo");
+		assertSame(revengSettingsWrapper, revengSettingsWrapper.setDefaultPackageName("foo"));
 		assertEquals("foo", wrappedRevengSettings.getDefaultPackageName());
 	}
 
 	@Test
 	public void testSetDetectManyToMany() {
 		assertTrue(wrappedRevengSettings.getDetectManyToMany());
-		revengSettingsWrapper.setDetectManyToMany(false);
+		assertSame(revengSettingsWrapper, revengSettingsWrapper.setDetectManyToMany(false));
 		assertFalse(wrappedRevengSettings.getDetectManyToMany());
 	}
 
 	@Test
 	public void testSetDetectOneToOne() {
 		assertTrue(wrappedRevengSettings.getDetectOneToOne());
-		revengSettingsWrapper.setDetectOneToOne(false);
+		assertSame(revengSettingsWrapper, revengSettingsWrapper.setDetectOneToOne(false));
 		assertFalse(wrappedRevengSettings.getDetectOneToOne());
 	}
 
 	@Test
 	public void testSetDetectOptimisticLock() {
 		assertTrue(wrappedRevengSettings.getDetectOptimsticLock());
-		revengSettingsWrapper.setDetectOptimisticLock(false);
+		assertSame(revengSettingsWrapper, revengSettingsWrapper.setDetectOptimisticLock(false));
 		assertFalse(wrappedRevengSettings.getDetectOptimsticLock());
 	}