@@ -257,44 +257,44 @@ public void testGetNonExistingTable() {
257257 public void testCreateAndGetTable () {
258258 String tableName = "test_create_and_get_table" ;
259259 TableId tableId = TableId .of (DATASET , tableName );
260- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
260+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
261261 TableInfo createdTableInfo = bigquery .create (TableInfo .of (tableId , tableDefinition ));
262262 assertNotNull (createdTableInfo );
263263 assertEquals (DATASET , createdTableInfo .tableId ().dataset ());
264264 assertEquals (tableName , createdTableInfo .tableId ().table ());
265265 TableInfo remoteTableInfo = bigquery .getTable (DATASET , tableName );
266266 assertNotNull (remoteTableInfo );
267- assertTrue (remoteTableInfo .definition () instanceof DefaultTableDefinition );
267+ assertTrue (remoteTableInfo .definition () instanceof TableDefinition );
268268 assertEquals (createdTableInfo .tableId (), remoteTableInfo .tableId ());
269269 assertEquals (BaseTableDefinition .Type .TABLE , remoteTableInfo .definition ().type ());
270270 assertEquals (TABLE_SCHEMA , remoteTableInfo .definition ().schema ());
271271 assertNotNull (remoteTableInfo .creationTime ());
272272 assertNotNull (remoteTableInfo .lastModifiedTime ());
273- assertNotNull (remoteTableInfo .<DefaultTableDefinition >definition ().numBytes ());
274- assertNotNull (remoteTableInfo .<DefaultTableDefinition >definition ().numRows ());
273+ assertNotNull (remoteTableInfo .<TableDefinition >definition ().numBytes ());
274+ assertNotNull (remoteTableInfo .<TableDefinition >definition ().numRows ());
275275 assertTrue (bigquery .delete (DATASET , tableName ));
276276 }
277277
278278 @ Test
279279 public void testCreateAndGetTableWithSelectedField () {
280280 String tableName = "test_create_and_get_selected_fields_table" ;
281281 TableId tableId = TableId .of (DATASET , tableName );
282- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
282+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
283283 TableInfo createdTableInfo = bigquery .create (TableInfo .of (tableId , tableDefinition ));
284284 assertNotNull (createdTableInfo );
285285 assertEquals (DATASET , createdTableInfo .tableId ().dataset ());
286286 assertEquals (tableName , createdTableInfo .tableId ().table ());
287287 TableInfo remoteTableInfo = bigquery .getTable (DATASET , tableName ,
288288 TableOption .fields (TableField .CREATION_TIME ));
289289 assertNotNull (remoteTableInfo );
290- assertTrue (remoteTableInfo .definition () instanceof DefaultTableDefinition );
290+ assertTrue (remoteTableInfo .definition () instanceof TableDefinition );
291291 assertEquals (createdTableInfo .tableId (), remoteTableInfo .tableId ());
292292 assertEquals (BaseTableDefinition .Type .TABLE , remoteTableInfo .definition ().type ());
293293 assertNotNull (remoteTableInfo .creationTime ());
294294 assertNull (remoteTableInfo .definition ().schema ());
295295 assertNull (remoteTableInfo .lastModifiedTime ());
296- assertNull (remoteTableInfo .<DefaultTableDefinition >definition ().numBytes ());
297- assertNull (remoteTableInfo .<DefaultTableDefinition >definition ().numRows ());
296+ assertNull (remoteTableInfo .<TableDefinition >definition ().numBytes ());
297+ assertNull (remoteTableInfo .<TableDefinition >definition ().numRows ());
298298 assertTrue (bigquery .delete (DATASET , tableName ));
299299 }
300300
@@ -409,7 +409,7 @@ public void testCreateViewTable() throws InterruptedException {
409409 @ Test
410410 public void testListTables () {
411411 String tableName = "test_list_tables" ;
412- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
412+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
413413 TableInfo tableInfo = TableInfo .of (TableId .of (DATASET , tableName ), tableDefinition );
414414 TableInfo createdTableInfo = bigquery .create (tableInfo );
415415 assertNotNull (createdTableInfo );
@@ -428,7 +428,7 @@ public void testListTables() {
428428 @ Test
429429 public void testUpdateTable () {
430430 String tableName = "test_update_table" ;
431- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
431+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
432432 TableInfo tableInfo = TableInfo .of (TableId .of (DATASET , tableName ), tableDefinition );
433433 TableInfo createdTableInfo = bigquery .create (tableInfo );
434434 assertNotNull (createdTableInfo );
@@ -444,27 +444,27 @@ public void testUpdateTable() {
444444 @ Test
445445 public void testUpdateTableWithSelectedFields () {
446446 String tableName = "test_update_with_selected_fields_table" ;
447- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
447+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
448448 TableInfo tableInfo = TableInfo .of (TableId .of (DATASET , tableName ), tableDefinition );
449449 TableInfo createdTableInfo = bigquery .create (tableInfo );
450450 assertNotNull (createdTableInfo );
451451 TableInfo updatedTableInfo = bigquery .update (tableInfo .toBuilder ().description ("newDescr" )
452452 .build (), TableOption .fields (TableField .DESCRIPTION ));
453- assertTrue (updatedTableInfo .definition () instanceof DefaultTableDefinition );
453+ assertTrue (updatedTableInfo .definition () instanceof TableDefinition );
454454 assertEquals (DATASET , updatedTableInfo .tableId ().dataset ());
455455 assertEquals (tableName , updatedTableInfo .tableId ().table ());
456456 assertEquals ("newDescr" , updatedTableInfo .description ());
457457 assertNull (updatedTableInfo .definition ().schema ());
458458 assertNull (updatedTableInfo .lastModifiedTime ());
459- assertNull (updatedTableInfo .<DefaultTableDefinition >definition ().numBytes ());
460- assertNull (updatedTableInfo .<DefaultTableDefinition >definition ().numRows ());
459+ assertNull (updatedTableInfo .<TableDefinition >definition ().numBytes ());
460+ assertNull (updatedTableInfo .<TableDefinition >definition ().numRows ());
461461 assertTrue (bigquery .delete (DATASET , tableName ));
462462 }
463463
464464 @ Test
465465 public void testUpdateNonExistingTable () {
466466 TableInfo tableInfo = TableInfo .of (TableId .of (DATASET , "test_update_non_existing_table" ),
467- DefaultTableDefinition .of (SIMPLE_SCHEMA ));
467+ TableDefinition .of (SIMPLE_SCHEMA ));
468468 try {
469469 bigquery .update (tableInfo );
470470 fail ("BigQueryException was expected" );
@@ -484,7 +484,7 @@ public void testDeleteNonExistingTable() {
484484 @ Test
485485 public void testInsertAll () {
486486 String tableName = "test_insert_all_table" ;
487- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
487+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
488488 TableInfo tableInfo = TableInfo .of (TableId .of (DATASET , tableName ), tableDefinition );
489489 assertNotNull (bigquery .create (tableInfo ));
490490 InsertAllRequest request = InsertAllRequest .builder (tableInfo .tableId ())
@@ -516,7 +516,7 @@ public void testInsertAll() {
516516 @ Test
517517 public void testInsertAllWithSuffix () throws InterruptedException {
518518 String tableName = "test_insert_all_with_suffix_table" ;
519- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
519+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
520520 TableInfo tableInfo = TableInfo .of (TableId .of (DATASET , tableName ), tableDefinition );
521521 assertNotNull (bigquery .create (tableInfo ));
522522 InsertAllRequest request = InsertAllRequest .builder (tableInfo .tableId ())
@@ -557,7 +557,7 @@ public void testInsertAllWithSuffix() throws InterruptedException {
557557 @ Test
558558 public void testInsertAllWithErrors () {
559559 String tableName = "test_insert_all_with_errors_table" ;
560- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
560+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
561561 TableInfo tableInfo = TableInfo .of (TableId .of (DATASET , tableName ), tableDefinition );
562562 assertNotNull (bigquery .create (tableInfo ));
563563 InsertAllRequest request = InsertAllRequest .builder (tableInfo .tableId ())
@@ -689,7 +689,7 @@ public void testCreateAndGetJob() throws InterruptedException {
689689 String sourceTableName = "test_create_and_get_job_source_table" ;
690690 String destinationTableName = "test_create_and_get_job_destination_table" ;
691691 TableId sourceTable = TableId .of (DATASET , sourceTableName );
692- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
692+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
693693 TableInfo tableInfo = TableInfo .of (sourceTable , tableDefinition );
694694 TableInfo createdTableInfo = bigquery .create (tableInfo );
695695 assertNotNull (createdTableInfo );
@@ -722,7 +722,7 @@ public void testCreateAndGetJobWithSelectedFields() throws InterruptedException
722722 String sourceTableName = "test_create_and_get_job_with_selected_fields_source_table" ;
723723 String destinationTableName = "test_create_and_get_job_with_selected_fields_destination_table" ;
724724 TableId sourceTable = TableId .of (DATASET , sourceTableName );
725- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
725+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
726726 TableInfo tableInfo = TableInfo .of (sourceTable , tableDefinition );
727727 TableInfo createdTableInfo = bigquery .create (tableInfo );
728728 assertNotNull (createdTableInfo );
@@ -762,7 +762,7 @@ public void testCopyJob() throws InterruptedException {
762762 String sourceTableName = "test_copy_job_source_table" ;
763763 String destinationTableName = "test_copy_job_destination_table" ;
764764 TableId sourceTable = TableId .of (DATASET , sourceTableName );
765- DefaultTableDefinition tableDefinition = DefaultTableDefinition .of (TABLE_SCHEMA );
765+ TableDefinition tableDefinition = TableDefinition .of (TABLE_SCHEMA );
766766 TableInfo tableInfo = TableInfo .of (sourceTable , tableDefinition );
767767 TableInfo createdTableInfo = bigquery .create (tableInfo );
768768 assertNotNull (createdTableInfo );
0 commit comments