Author: tchemit Date: 2012-09-05 17:59:50 +0200 (Wed, 05 Sep 2012) New Revision: 2657 Url: http://nuiton.org/repositories/revision/topia/2657 Log: fixes #2302: TopiaCsvExport should use as incoming source Iterable not List Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java 2012-09-05 15:58:19 UTC (rev 2656) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java 2012-09-05 15:59:50 UTC (rev 2657) @@ -28,8 +28,6 @@ import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import java.util.List; - /** * Prepare data to export. * @@ -38,7 +36,7 @@ */ public interface PrepareDataForExport<T extends TopiaEntityEnum> { - <E extends TopiaEntity> List<E> prepareData(TableMeta<T> tableMeta); + <E extends TopiaEntity> Iterable<E> prepareData(TableMeta<T> tableMeta); - <E extends TopiaEntity> List<E> prepareData(AssociationMeta<T> associationMeta); + <E extends TopiaEntity> Iterable<E> prepareData(AssociationMeta<T> associationMeta); } Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-09-05 15:58:19 UTC (rev 2656) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-09-05 15:59:50 UTC (rev 2657) @@ -136,8 +136,7 @@ ExportModelFactory<T> modelFactory, PrepareDataForExport<T> prepareDataForExport) { - - List<E> datas = prepareDataForExport.prepareData(tableMeta); + Iterable<E> datas = prepareDataForExport.prepareData(tableMeta); ExportModel<E> model = modelFactory.buildForExport(tableMeta); return Export.newExport(model, datas); } @@ -146,7 +145,7 @@ ExportModelFactory<T> modelFactory, PrepareDataForExport<T> prepareDataForExport) { - List<E> datas = prepareDataForExport.prepareData(associationMeta); + Iterable<E> datas = prepareDataForExport.prepareData(associationMeta); ExportModel<E> model = modelFactory.buildForExport(associationMeta); return Export.newExport(model, datas); }