HBX-2599: Change return value of 'DatabaseReaderWrapper#collectDatabaseTables()' to 'Map<String, List<TableWrapper>>'

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

Author: koentsje

jbt/src/main/java/org/hibernate/tool/orm/jbt/wrp/DatabaseReaderWrapperFactory.java

@@ -30,7 +30,7 @@ public static DatabaseReaderWrapper createDatabaseReaderWrapper(
 	}
 
 	static interface DatabaseReaderWrapper extends Wrapper {
-		Map<String, List<Table>> collectDatabaseTables();
+		Map<String, List<TableWrapper>> collectDatabaseTables();
 	}
 
 	static class DatabaseReaderWrapperImpl implements DatabaseReaderWrapper {
@@ -62,9 +62,9 @@ public DatabaseReaderWrapperImpl(
 		    revengMetadataCollector = new RevengMetadataCollector(metadataBuildingContext);
 		}
 
-		public Map<String, List<Table>> collectDatabaseTables() {
+		public Map<String, List<TableWrapper>> collectDatabaseTables() {
 			databaseReader.readDatabaseSchema(revengMetadataCollector);
-			Map<String, List<Table>> result = new HashMap<String, List<Table>>();
+			Map<String, List<TableWrapper>> result = new HashMap<String, List<TableWrapper>>();
 			for (Table table : revengMetadataCollector.getTables()) {
 				String qualifier = "";
 				if (table.getCatalog() != null) {
@@ -76,12 +76,12 @@ public Map<String, List<Table>> collectDatabaseTables() {
 					}
 					qualifier += table.getSchema();
 				}
-				List<Table> list = result.get(qualifier);
+				List<TableWrapper> list = result.get(qualifier);
 				if (list == null) {
-					list = new ArrayList<Table>();
+					list = new ArrayList<TableWrapper>();
 					result.put(qualifier, list);
 				}
-				list.add(table);
+				list.add(new DelegatingTableWrapperImpl(table));
 			}			
 			return result;
 		}

jbt/src/test/java/org/hibernate/tool/orm/jbt/wrp/DatabaseReaderWrapperFactoryTest.java

@@ -46,17 +46,18 @@ public void testCollectDatabaseTables() throws Exception {
 		Connection connection = DriverManager.getConnection("jdbc:h2:mem:test");
 		Statement statement = connection.createStatement();
 		statement.execute("CREATE TABLE FOO(id int primary key, bar varchar(255))");
-		Map<String, List<Table>> tableMap = databaseReaderWrapper.collectDatabaseTables();
-		assertEquals(2, tableMap.size());
-		Set<String> tableMapKeys = tableMap.keySet();
+		Map<String, List<TableWrapper>> tableWrapperMap = databaseReaderWrapper.collectDatabaseTables();
+		assertEquals(2, tableWrapperMap.size());
+		Set<String> tableMapKeys = tableWrapperMap.keySet();
 		assertTrue(tableMapKeys.contains("TEST.PUBLIC"));
 		assertTrue(tableMapKeys.contains("TEST.INFORMATION_SCHEMA"));
-		List<Table> tables = tableMap.get("TEST.PUBLIC");
-		assertEquals(1, tables.size());
-		Table table = tables.get(0);
-		assertEquals("TEST", table.getCatalog());
-		assertEquals("PUBLIC", table.getSchema());
-		assertEquals("FOO", table.getName());
+		List<TableWrapper> tableWrappers = tableWrapperMap.get("TEST.PUBLIC");
+		assertEquals(1, tableWrappers.size());
+		TableWrapper tableWrapper = tableWrappers.get(0);
+		assertEquals("TEST", tableWrapper.getCatalog());
+		assertEquals("PUBLIC", tableWrapper.getSchema());
+		assertEquals("FOO", tableWrapper.getName());
+		assertTrue(tableWrapper.getColumnIterator().hasNext());
 		statement.execute("DROP TABLE FOO");
 		statement.close();
 		connection.close();