[Topia-commits] r2661 - in branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv: . in

Author: tchemit Date: 2012-09-12 17:04:21 +0200 (Wed, 12 Sep 2012) New Revision: 2661 Url: http://nuiton.org/repositories/revision/topia/2661 Log: refs #2310: Add progress model while importing data Added: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java Removed: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressionModel.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java Copied: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java (from rev 2660, branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressionModel.java) =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java (rev 0) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java 2012-09-12 15:04:21 UTC (rev 2661) @@ -0,0 +1,46 @@ +package org.nuiton.topia.persistence.csv; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import java.io.Serializable; + +/** + * Csv progress model contract. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.6.14 + */ +public interface CsvProgressModel extends Serializable { + + long getNbSteps(); + + void setNbSteps(long nbSteps); + + float getProgress(); + + void setProgress(float progress); + + void incrementsProgress(); +} Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressionModel.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressionModel.java 2012-09-11 16:47:05 UTC (rev 2660) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/CsvProgressionModel.java 2012-09-12 15:04:21 UTC (rev 2661) @@ -1,46 +0,0 @@ -package org.nuiton.topia.persistence.csv; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import java.io.Serializable; - -/** - * Csv progression model contract. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.6.13 - */ -public interface CsvProgressionModel extends Serializable { - - long getNbSteps(); - - float getProgression(); - - void setProgression(float progression); - - void incrementsProgression(); - - void setNbSteps(long nbSteps); -} Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java 2012-09-11 16:47:05 UTC (rev 2660) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java 2012-09-12 15:04:21 UTC (rev 2661) @@ -24,7 +24,7 @@ */ import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topia.persistence.csv.CsvProgressionModel; +import org.nuiton.topia.persistence.csv.CsvProgressModel; import java.io.Serializable; @@ -54,7 +54,7 @@ /** Count of updated entities. */ protected int numberUpdated; - protected final CsvProgressionModel progressionModel; + protected final CsvProgressModel progressModel; public static <T extends TopiaEntityEnum> CsvImportResult<T> newResult(T entityType, String importFileName, @@ -67,20 +67,20 @@ public static <T extends TopiaEntityEnum> CsvImportResult<T> newResult(T entityType, String importFileName, boolean createIfNotFound, - CsvProgressionModel progressionModel) { + CsvProgressModel progressModel) { CsvImportResult<T> result = new CsvImportResult<T>(entityType, importFileName, - createIfNotFound, progressionModel); + createIfNotFound, progressModel); return result; } protected CsvImportResult(T entityType, String importFileName, boolean createIfNotFound, - CsvProgressionModel progressionModel) { + CsvProgressModel progressModel) { this.entityType = entityType; this.importFileName = importFileName; this.createIfNotFound = createIfNotFound; - this.progressionModel = progressionModel; + this.progressModel = progressModel; } public T getEntityType() { @@ -112,7 +112,7 @@ numberUpdated++; } - public CsvProgressionModel getProgressionModel() { - return progressionModel; + public CsvProgressModel getProgressModel() { + return progressModel; } } Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-09-11 16:47:05 UTC (rev 2660) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-09-12 15:04:21 UTC (rev 2661) @@ -35,7 +35,7 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.topia.persistence.csv.CsvProgressionModel; +import org.nuiton.topia.persistence.csv.CsvProgressModel; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.MetaFilenameAware; import org.nuiton.topia.persistence.metadata.TableMeta; @@ -248,8 +248,8 @@ Import<E> importer, CsvImportResult<T> csvResult) throws TopiaException { - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); for (E entity : importer) { Map<String, Object> properties = meta.prepareCreate( @@ -260,8 +260,8 @@ if (csvResult != null) { csvResult.incrementsNumberUpdated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } } @@ -275,8 +275,8 @@ TopiaContextImplementor context = dao.getContext(); - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); int compt = 0; for (E entity : importer) { @@ -289,8 +289,8 @@ if (csvResult != null) { csvResult.incrementsNumberUpdated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } compt++; @@ -306,8 +306,8 @@ Import<E> importer, CsvImportResult<T> csvResult) throws TopiaException { - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); List<E> result = Lists.newArrayList(); for (E entity : importer) { @@ -319,8 +319,8 @@ if (csvResult != null) { csvResult.incrementsNumberUpdated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } @@ -335,8 +335,8 @@ Import<E> importer, CsvImportResult<T> csvResult) throws TopiaException { - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); for (E entity : importer) { String topiaId = entity.getTopiaId(); @@ -360,8 +360,8 @@ if (csvResult != null) { csvResult.incrementsNumberCreated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } } else { @@ -382,8 +382,8 @@ CsvImportResult<T> csvResult, int nbRowBuffer) throws TopiaException { - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); T source = meta.getSource(); T target = meta.getTarget(); @@ -415,8 +415,8 @@ } if (csvResult != null) { csvResult.incrementsNumberUpdated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } } @@ -431,8 +431,8 @@ CsvImportResult<T> csvResult, int nbRowBuffer) throws TopiaException { - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); T source = meta.getSource(); T target = meta.getTarget(); @@ -468,8 +468,8 @@ } if (csvResult != null) { csvResult.incrementsNumberUpdated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } } @@ -485,8 +485,8 @@ CsvImportResult<T> csvResult, int nbRowBuffer) throws TopiaException { - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); T source = meta.getSource(); T target = meta.getTarget(); @@ -524,8 +524,8 @@ } if (csvResult != null) { csvResult.incrementsNumberUpdated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } } @@ -541,8 +541,8 @@ CsvImportResult<T> csvResult, int nbRowBuffer) throws TopiaException { - CsvProgressionModel progressionModel = csvResult == null ? null : - csvResult.getProgressionModel(); + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); T source = meta.getSource(); T target = meta.getTarget(); @@ -578,8 +578,8 @@ } if (csvResult != null) { csvResult.incrementsNumberUpdated(); - if (progressionModel != null) { - progressionModel.incrementsProgression(); + if (progressModel != null) { + progressModel.incrementsProgress(); } } }