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

  - Add new interface method 'org.hibernate.tool.orm.jbt.api.wrp.TableWrapper#getForeignKeyIterator()'
  - Add implementation of above interface in 'org.hibernate.tool.orm.jbt.internal.factory.TableWrapperFactory.TableWrapperImpl#getForeignKeyIterator()'
  - Add additional test case 'org.hibernate.tool.orm.jbt.api.wrp.TableWrapperTest#testGetForeignKeyIterator()'

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

Author: koentsje

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

@@ -10,6 +10,7 @@ public interface TableWrapper extends Wrapper {
 	String getSchema();
 	PrimaryKeyWrapper getPrimaryKey();
 	Iterator<ColumnWrapper> getColumnIterator();
+	Iterator<ForeignKeyWrapper> getForeignKeyIterator();
 	String getComment();
 	String getRowId();
 	String getSubselect();

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

@@ -3,10 +3,12 @@
 import java.util.Iterator;
 
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
 import org.hibernate.mapping.PrimaryKey;
 import org.hibernate.mapping.Table;
 import org.hibernate.mapping.Value;
 import org.hibernate.tool.orm.jbt.api.wrp.ColumnWrapper;
+import org.hibernate.tool.orm.jbt.api.wrp.ForeignKeyWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.PrimaryKeyWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.TableWrapper;
 import org.hibernate.tool.orm.jbt.api.wrp.ValueWrapper;
@@ -77,6 +79,22 @@ public ColumnWrapper next() {
 
 			};
 		}
+		
+		@Override 
+		public Iterator<ForeignKeyWrapper> getForeignKeyIterator() {
+			Iterator<ForeignKey> iterator = table.getForeignKeys().values().iterator();
+			return new Iterator<ForeignKeyWrapper>() {
+				@Override
+				public boolean hasNext() {
+					return iterator.hasNext();
+				}
+				@Override
+				public ForeignKeyWrapper next() {
+					return ForeignKeyWrapperFactory.createForeignKeyWrapper(iterator.next());
+				}
+				
+			};
+		}
 
 		@Override
 		public String getComment() { 

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

@@ -10,9 +10,11 @@
 
 import java.lang.reflect.Method;
 import java.util.Iterator;
+import java.util.List;
 
 import org.hibernate.mapping.BasicValue;
 import org.hibernate.mapping.Column;
+import org.hibernate.mapping.ForeignKey;
 import org.hibernate.mapping.KeyValue;
 import org.hibernate.mapping.PrimaryKey;
 import org.hibernate.mapping.Table;
@@ -88,6 +90,18 @@ public void testGetColumnIterator() {
 		assertSame(column, columnIterator.next().getWrappedObject());
 	}
 
+	@Test
+	public void testGetForeignKeyIterator() {
+		Column column = new Column("Hibernate Tools");
+		Iterator<ForeignKeyWrapper> foreignKeyIterator = tableWrapper.getForeignKeyIterator();
+		assertFalse(foreignKeyIterator.hasNext());
+		wrappedTable.createForeignKey("foo", List.of(column), "bar", "");
+		foreignKeyIterator = tableWrapper.getForeignKeyIterator();
+		assertTrue(foreignKeyIterator.hasNext());
+		ForeignKeyWrapper foreignKeyWrapper = foreignKeyIterator.next();
+		assertTrue(((ForeignKey)foreignKeyWrapper.getWrappedObject()).containsColumn(column));
+	}
+	
 	@Test
 	public void testGetComment() {
 		assertNull(tableWrapper.getComment());