January 2012 - Echobase-commits - mailman.cloud.codelutin.com

r283 - in trunk/echobase-services/src/main: java/fr/ifremer/echobase/services java/fr/ifremer/echobase/services/configurations resources/i18n
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 22:31:49 +0100 (Sun, 15 Jan 2012) New Revision: 283 Url: http://forge.codelutin.com/repositories/revision/echobase/283 Log: - continue import data definition - create also a default user:user (not admin) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -26,7 +26,9 @@ import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; +import org.nuiton.topia.TopiaException; +import java.io.IOException; import java.util.Map; /** @@ -37,5 +39,5 @@ */ public abstract class AbstractImportDataService<M extends AbstractImportConfiguration> extends EchoBaseServiceSupport { - public abstract Map<InputFile, CsvImportResult> startImport(M configuration, EchoBaseUser user); + public abstract Map<InputFile, CsvImportResult> startImport(M configuration, EchoBaseUser user) throws IOException, TopiaException; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataCompleteImportService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -24,13 +24,32 @@ package fr.ifremer.echobase.services; import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.VoyageImpl; +import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.configurations.CommonDataCompleteImportConfiguration; +import fr.ifremer.echobase.services.csv.CsvModelUtil; +import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportToMap; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -42,11 +61,44 @@ public class CommonDataCompleteImportService extends AbstractImportDataService<CommonDataCompleteImportConfiguration> { @Override - public Map<InputFile, CsvImportResult> startImport(CommonDataCompleteImportConfiguration configuration, EchoBaseUser user) { + public Map<InputFile, CsvImportResult> startImport(CommonDataCompleteImportConfiguration configuration, + EchoBaseUser user) throws IOException, TopiaException { + Map<InputFile, CsvImportResult> result = Maps.newHashMap(); + char csvSeparator = serviceContext.getConfiguration().getCsvSeparator(); - importCasinoFile(configuration.getCasinoFile(), csvSeparator); + Mission mission = getEntityById(Mission.class, configuration.getMissionId()); + AreaOfOperation areaOfOperation = getEntityById(AreaOfOperation.class, configuration.getAreaOfOperationId()); + Vessel vessel = getEntityById(Vessel.class, configuration.getVesselId()); + + importVoyageFile(configuration.getVoyageFile(), + mission, + areaOfOperation, + configuration.getVoyageDescription(), + configuration.getDatum(), + csvSeparator); + + List<Voyage> allVoyages = getEntities(Voyage.class); + Map<String, Voyage> voyageMap = Maps.uniqueIndex( + allVoyages, EchoBaseFunctions.VOYAGE_NAME); + + importTransitFile(configuration.getTransitFile(), + voyageMap, + configuration.getTransitRelatedActivity(), + csvSeparator); + + importTransectFile(configuration.getTransectFile(), + vessel, + voyageMap, + configuration.getDatum(), + configuration.getTransectLicence(), + configuration.getTransectGeospatialVerticalPositive(), + configuration.getTransectBinUnitsPingAxis(), + csvSeparator); + importEchotypeFile(configuration.getEchotypeFile(), csvSeparator); + + commitTransaction("Could not commit transaction of common data import"); return result; } @@ -61,10 +113,224 @@ } } - private void importCasinoFile(InputFile casinoFile, char csvSeparator) { + protected void importVoyageFile(InputFile inputFile, + Mission mission, + AreaOfOperation areaOfOperation, + String voyageDescription, + String datum, + char csvSeparator) throws IOException, TopiaException { + + + ImportModel<Voyage> csvModel = new VoyageImportModel(csvSeparator); + + TopiaDAO<Voyage> dao = getDAO(Voyage.class); + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + Import<Voyage> importer = Import.newImport(csvModel, reader); + for (Voyage voyage : importer) { + voyage.setMission(mission); + voyage.setAreaOfOperation(areaOfOperation); + voyage.setDescription(voyageDescription); + voyage.setDatum(datum); + dao.create(voyage); + } + + } finally { + reader.close(); + } } - private void importEchotypeFile(InputFile echotypeFile, char csvSeparator) { + protected void importTransitFile(InputFile inputFile, + Map<String, Voyage> voyageMap, + String relatedActivity, + char csvSeparator) throws TopiaException, IOException { + TransitImportModel csvModel = new TransitImportModel(csvSeparator, voyageMap); + TopiaDAO<Transit> dao = getDAO(Transit.class); + + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + ImportToMap importer = ImportToMap.newImport(csvModel, reader); + for (Map<String, Object> row : importer) { + + Voyage voyage = (Voyage) row.get(TransitImportModel.TRANSIT_VoyageId); + + Transit transit = dao.create(); + + transit.setDescription((String) row.get(Transit.PROPERTY_DESCRIPTION)); + transit.setStartLocality((String) row.get(Transit.PROPERTY_START_LOCALITY)); + transit.setEndLocality((String) row.get(Transit.PROPERTY_END_LOCALITY)); + + transit.setStartTime((Date) row.get(Transit.PROPERTY_START_TIME)); + transit.setEndTime((Date) row.get(Transit.PROPERTY_END_TIME)); + transit.setRelatedActivity(relatedActivity); + voyage.addTransit(transit); + } + + } finally { + reader.close(); + } } + + private void importTransectFile(InputFile inputFile, + Vessel vessel, + Map<String, Voyage> voyageMap, + String datum, + String license, + String geospatialVerticalPositive, + String binUnitsPingAxis, + char csvSeparator + ) throws TopiaException, IOException { + + TransectImportModel csvModel = new TransectImportModel(csvSeparator, voyageMap); + + TopiaDAO<Transect> dao = getDAO(Transect.class); + + /* + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + */ + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + ImportToMap importer = ImportToMap.newImport(csvModel, reader); + for (Map<String, Object> row : importer) { + + Voyage voyage = (Voyage) row.get(TransectImportModel.TRANSECT_VoyageID); + + Transect transect = dao.create( + Transect.PROPERTY_VESSEL, vessel + ); + + transect.setTitle((String) row.get(Transect.PROPERTY_TITLE)); + transect.setTransectAbstract((String) row.get(Transect.PROPERTY_TRANSECT_ABSTRACT)); + transect.setComment((String) row.get(Transect.PROPERTY_COMMENT)); + + transect.setDatum(datum); + transect.setLicence(license); + transect.setGeospatialVerticalPositive(geospatialVerticalPositive); + transect.setBinUnitsPingAxis(binUnitsPingAxis); + + transect.setDateCreated((Date) row.get(Transect.PROPERTY_DATE_CREATED)); + transect.setTimeCoverageStart((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_START)); + transect.setTimeCoverageEnd((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_END)); + + + transect.setGeospatialLatMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MIN)); + transect.setGeospatialLonMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MIN)); + transect.setGeospatialVerticalMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN)); + + transect.setGeospatialLatMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MAX)); + transect.setGeospatialLonMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MAX)); + transect.setGeospatialVerticalMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX)); + + // find out the transit where to reattach the transect + List<Transit> transits = voyage.getTransit(); + + Transit transit = null; + + if (CollectionUtils.isNotEmpty(transits)) { + for (Transit aTransit : transits) { + transit = aTransit; + break; + } + } + if (transit == null) { + throw new EchoBaseTechnicalException( + "Could not find transit to reattach transect " + + transect.getTitle()); + } + + transit.addTransect(transect); + } + + } finally { + reader.close(); + } + } + + private void importEchotypeFile(InputFile inputFile, char csvSeparator) { + + } + + protected static class VoyageImportModel extends CsvModelUtil.AbstractImportModel<Voyage> { + + public VoyageImportModel(char separator) { + super(separator); + modelBuilder.newMandatoryColumn("VoyageName", Voyage.PROPERTY_NAME); + modelBuilder.newMandatoryColumn("VoyageStartDate", Voyage.PROPERTY_START_DATE, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn("VoyageEndDate", Voyage.PROPERTY_END_DATE, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn("StartPort", Voyage.PROPERTY_START_PORT); + modelBuilder.newMandatoryColumn("EndPort", Voyage.PROPERTY_END_PORT); + } + + @Override + public Voyage newEmptyInstance() { + return new VoyageImpl(); + } + } + + protected static class TransitImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { + + public static final String TRANSIT_VoyageId = "VoyageId"; + + protected final Map<String, Voyage> voyageMap; + + public TransitImportModel(char separator, + Map<String, Voyage> voyageMap) { + super(separator); + this.voyageMap = voyageMap; + modelBuilder.newMandatoryColumn(TRANSIT_VoyageId, TRANSIT_VoyageId, CsvModelUtil.newForeignKeyValue(Voyage.class, voyageMap)); + modelBuilder.newMandatoryColumn("TransitName", Transit.PROPERTY_DESCRIPTION); + modelBuilder.newMandatoryColumn("StartTime", Transit.PROPERTY_START_TIME, CsvModelUtil.DAY_TIME); + modelBuilder.newMandatoryColumn("EndTime", Transit.PROPERTY_END_TIME, CsvModelUtil.DAY_TIME); + modelBuilder.newMandatoryColumn("StartLocality", Transit.PROPERTY_START_LOCALITY); + modelBuilder.newMandatoryColumn("EndLocality", Transit.PROPERTY_END_LOCALITY); + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + } + + protected static class TransectImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { + + public static final String TRANSECT_stratum = "stratum"; + public static final String TRANSECT_VoyageID = "VoyageID"; + public static final String TRANSECT_datef = "datef"; + public static final String TRANSECT_heuref = "heuref"; + + protected final Map<String, Voyage> voyageMap; + + public TransectImportModel(char separator, + Map<String, Voyage> voyageMap) { + super(separator); + this.voyageMap = voyageMap; + + modelBuilder.newMandatoryColumn("Title", Transect.PROPERTY_TITLE); + modelBuilder.newMandatoryColumn("abstract", Transect.PROPERTY_TRANSECT_ABSTRACT); + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn("comment", Transect.PROPERTY_COMMENT); + modelBuilder.newMandatoryColumn(TRANSECT_VoyageID, TRANSECT_VoyageID, CsvModelUtil.newForeignKeyValue(Voyage.class, voyageMap)); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + + modelBuilder.newMandatoryColumn("DateCreated", Transect.PROPERTY_DATE_CREATED, CsvModelUtil.IMPORT_DAY2); + modelBuilder.newMandatoryColumn("TimeCoverageStart", Transect.PROPERTY_TIME_COVERAGE_START, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("TimeCoverageEnd", Transect.PROPERTY_TIME_COVERAGE_END, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("GeospatialLonMin", Transect.PROPERTY_GEOSPATIAL_LON_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMin", Transect.PROPERTY_GEOSPATIAL_LAT_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMin", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLonMax", Transect.PROPERTY_GEOSPATIAL_LON_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMax", Transect.PROPERTY_GEOSPATIAL_LAT_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMax", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataFromTransectImportService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -24,10 +24,26 @@ package fr.ifremer.echobase.services; import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.data.Transect; +import fr.ifremer.echobase.entities.data.Transit; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.services.configurations.CommonDataFromTransectImportConfiguration; +import fr.ifremer.echobase.services.csv.CsvModelUtil; +import org.apache.commons.collections.CollectionUtils; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.util.csv.ImportToMap; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.io.Reader; +import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -39,15 +55,133 @@ public class CommonDataFromTransectImportService extends AbstractImportDataService<CommonDataFromTransectImportConfiguration> { @Override - public Map<InputFile, CsvImportResult> startImport(CommonDataFromTransectImportConfiguration configuration, EchoBaseUser user) { + public Map<InputFile, CsvImportResult> startImport(CommonDataFromTransectImportConfiguration configuration, + EchoBaseUser user) throws IOException, TopiaException { Map<InputFile, CsvImportResult> result = Maps.newHashMap(); char csvSeparator = serviceContext.getConfiguration().getCsvSeparator(); - importCasinoFile(configuration.getCasinoFile(), csvSeparator); + Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); + Vessel vessel = getEntityById(Vessel.class, configuration.getVesselId()); + + importTransectFile(configuration.getTransectFile(), + voyage, + vessel, + configuration.getDatum(), + configuration.getTransectLicence(), + configuration.getTransectGeospatialVerticalPositive(), + configuration.getTransectBinUnitsPingAxis(), + csvSeparator); return result; } - protected void importCasinoFile(InputFile inputFile, char csvSeparator) { + private void importTransectFile(InputFile inputFile, + Voyage voyage, + Vessel vessel, + String datum, + String license, + String geospatialVerticalPositive, + String binUnitsPingAxis, + char csvSeparator + ) throws TopiaException, IOException { + TransectImportModel csvModel = new TransectImportModel(csvSeparator); + + TopiaDAO<Transect> dao = getDAO(Transect.class); + + /* + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + */ + Reader reader = new BufferedReader(new FileReader(inputFile.getFile())); + try { + ImportToMap importer = ImportToMap.newImport(csvModel, reader); + for (Map<String, Object> row : importer) { + + + Transect transect = dao.create( + Transect.PROPERTY_VESSEL, vessel + ); + + transect.setTitle((String) row.get(Transect.PROPERTY_TITLE)); + transect.setTransectAbstract((String) row.get(Transect.PROPERTY_TRANSECT_ABSTRACT)); + transect.setComment((String) row.get(Transect.PROPERTY_COMMENT)); + + transect.setDatum(datum); + transect.setLicence(license); + transect.setGeospatialVerticalPositive(geospatialVerticalPositive); + transect.setBinUnitsPingAxis(binUnitsPingAxis); + + transect.setDateCreated((Date) row.get(Transect.PROPERTY_DATE_CREATED)); + transect.setTimeCoverageStart((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_START)); + transect.setTimeCoverageEnd((Date) row.get(Transect.PROPERTY_TIME_COVERAGE_END)); + + + transect.setGeospatialLatMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MIN)); + transect.setGeospatialLonMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MIN)); + transect.setGeospatialVerticalMin((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN)); + + transect.setGeospatialLatMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LAT_MAX)); + transect.setGeospatialLonMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_LON_MAX)); + transect.setGeospatialVerticalMax((Float) row.get(Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX)); + + // find out the transit where to reattach the transect + List<Transit> transits = voyage.getTransit(); + + Transit transit = null; + + if (CollectionUtils.isNotEmpty(transits)) { + for (Transit aTransit : transits) { + transit = aTransit; + break; + } + } + if (transit == null) { + throw new EchoBaseTechnicalException( + "Could not find transit to reattach transect " + + transect.getTitle()); + } + + transit.addTransect(transect); + } + + } finally { + reader.close(); + } } + + protected static class TransectImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { + + public static final String TRANSECT_stratum = "stratum"; + public static final String TRANSECT_VoyageID = "VoyageID"; + public static final String TRANSECT_datef = "datef"; + public static final String TRANSECT_heuref = "heuref"; + + public TransectImportModel(char separator) { + super(separator); + + modelBuilder.newMandatoryColumn("Title", Transect.PROPERTY_TITLE); + modelBuilder.newMandatoryColumn("abstract", Transect.PROPERTY_TRANSECT_ABSTRACT); + modelBuilder.newMandatoryColumn(TRANSECT_stratum, TRANSECT_stratum); + modelBuilder.newMandatoryColumn("comment", Transect.PROPERTY_COMMENT); + modelBuilder.newMandatoryColumn(TRANSECT_datef, TRANSECT_datef, CsvModelUtil.DAY); + modelBuilder.newMandatoryColumn(TRANSECT_heuref, TRANSECT_heuref, CsvModelUtil.TIME); + + modelBuilder.newMandatoryColumn("DateCreated", Transect.PROPERTY_DATE_CREATED, CsvModelUtil.IMPORT_DAY2); + modelBuilder.newMandatoryColumn("TimeCoverageStart", Transect.PROPERTY_TIME_COVERAGE_START, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("TimeCoverageEnd", Transect.PROPERTY_TIME_COVERAGE_END, CsvModelUtil.TIME); + modelBuilder.newMandatoryColumn("GeospatialLonMin", Transect.PROPERTY_GEOSPATIAL_LON_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMin", Transect.PROPERTY_GEOSPATIAL_LAT_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMin", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MIN, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLonMax", Transect.PROPERTY_GEOSPATIAL_LON_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialLatMax", Transect.PROPERTY_GEOSPATIAL_LAT_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + modelBuilder.newMandatoryColumn("GeospatialVerticalMax", Transect.PROPERTY_GEOSPATIAL_VERTICAL_MAX, CsvModelUtil.PRIMITIVE_FLOAT); + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -195,7 +195,7 @@ newServiceContext.newService(UserService.class); // create admin user - userService.createDefaultAdminUser(); + userService.createDefaultUsers(); // get admin from h2 db EchoBaseUser admin = userService.getUserByEmail( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-01-15 21:31:49 UTC (rev 283) @@ -24,7 +24,6 @@ package fr.ifremer.echobase.services; import com.google.common.base.Preconditions; -import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserDAO; @@ -47,6 +46,10 @@ public static final String DEFAULT_ADMIN_PASSWORD = "admin"; + public static final String DEFAULT_USER_EMAIL = "user"; + + public static final String DEFAULT_USER_PASSWORD = "user"; + public List<EchoBaseUser> getUsers() { return getUsers(null); } @@ -127,7 +130,7 @@ return s.equals(user.getPassword()); } - public void createDefaultAdminUser() { + public void createDefaultUsers() { EchoBaseUserDTO userDTO; userDTO = new EchoBaseUserDTOImpl(); userDTO.setEmail(DEFAULT_ADMIN_EMAIL); @@ -135,15 +138,11 @@ userDTO.setAdmin(true); createOrUpdate(userDTO); - if (getConfiguration().getOptionAsBoolean(EchoBaseConfiguration.OPTION_CREATE_ADMINS)) { - for (int i = 0; i < 1000; i++) { - userDTO = new EchoBaseUserDTOImpl(); - userDTO.setEmail(DEFAULT_ADMIN_EMAIL + i); - userDTO.setPassword(DEFAULT_ADMIN_PASSWORD); - userDTO.setAdmin(i % 2 == 0); - createOrUpdate(userDTO); - } - } + userDTO = new EchoBaseUserDTOImpl(); + userDTO.setEmail(DEFAULT_USER_EMAIL); + userDTO.setPassword(DEFAULT_USER_PASSWORD); + userDTO.setAdmin(false); + createOrUpdate(userDTO); } public static String encodePassword(String password) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -45,12 +45,18 @@ /** Selected vessel id to find out transect where to import datas. */ protected String vesselId; - /** Manual field 1. */ - protected String field1; + /** Manual echosounderSoundSpeed. */ + protected String echosounderSoundSpeed = "Variable"; - /** Manual field 2. */ - protected String field2; + /** Manual soundSpeedCalculations. */ + protected String soundSpeedCalculations = "SVProbe"; + /** Manual pingDutyCycle. */ + protected String pingDutyCycle = "ME70Table"; + + /** Manual notes. */ + protected String notes; + /** Movies file to import. */ protected final InputFile moviesFile; @@ -74,22 +80,38 @@ this.vesselId = vesselId; } - public String getField1() { - return field1; + public String getEchosounderSoundSpeed() { + return echosounderSoundSpeed; } - public void setField1(String field1) { - this.field1 = field1; + public void setEchosounderSoundSpeed(String echosounderSoundSpeed) { + this.echosounderSoundSpeed = echosounderSoundSpeed; } - public String getField2() { - return field2; + public String getSoundSpeedCalculations() { + return soundSpeedCalculations; } - public void setField2(String field2) { - this.field2 = field2; + public void setSoundSpeedCalculations(String soundSpeedCalculations) { + this.soundSpeedCalculations = soundSpeedCalculations; } + public String getPingDutyCycle() { + return pingDutyCycle; + } + + public void setPingDutyCycle(String pingDutyCycle) { + this.pingDutyCycle = pingDutyCycle; + } + + public String getNotes() { + return notes; + } + + public void setNotes(String notes) { + this.notes = notes; + } + public InputFile getMoviesFile() { return moviesFile; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AccousticRegionDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -39,19 +39,12 @@ private static final long serialVersionUID = 1L; - /** Selected voyage id where to import datas. */ protected String voyageId; /** Selected vessel id to find out transect where to import datas. */ protected String vesselId; - /** Manual field 1. */ - protected String field1; - - /** Manual field 2. */ - protected String field2; - /** Region file to import. */ protected final InputFile regionsFile; @@ -59,8 +52,10 @@ protected final InputFile associationFile; public AccousticRegionDataImportConfiguration(Locale locale) { - regionsFile = InputFile.newFile(l_(locale, "echobase.common.regionsFile")); - associationFile = InputFile.newFile(l_(locale, "echobase.common.associationFile")); + regionsFile = InputFile.newFile( + l_(locale, "echobase.common.regionsFile")); + associationFile = InputFile.newFile( + l_(locale, "echobase.common.associationFile")); } public String getVoyageId() { @@ -79,22 +74,6 @@ this.vesselId = vesselId; } - public String getField1() { - return field1; - } - - public void setField1(String field1) { - this.field1 = field1; - } - - public String getField2() { - return field2; - } - - public void setField2(String field2) { - this.field2 = field2; - } - public InputFile getRegionsFile() { return regionsFile; } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -55,10 +55,14 @@ protected final InputFile tblMensurationClasseFile; public CatchesDataImportConfiguration(Locale locale) { - tlbeStationFile = InputFile.newFile(l_(locale, "echobase.common.tlbeStationFile")); - xtblTriFile = InputFile.newFile(l_(locale, "echobase.common.xtblTriFile")); - tblMensurationFile = InputFile.newFile(l_(locale, "echobase.common.tblMensurationFile")); - tblMensurationClasseFile = InputFile.newFile(l_(locale, "echobase.common.tblMensurationClasseFile")); + tlbeStationFile = InputFile.newFile( + l_(locale, "echobase.common.tlbeStationFile")); + xtblTriFile = InputFile.newFile( + l_(locale, "echobase.common.xtblTriFile")); + tblMensurationFile = InputFile.newFile( + l_(locale, "echobase.common.tblMensurationFile")); + tblMensurationClasseFile = InputFile.newFile( + l_(locale, "echobase.common.tblMensurationClasseFile")); } public String getVoyageId() { @@ -73,7 +77,6 @@ return tlbeStationFile; } - public InputFile getXtblTriFile() { return xtblTriFile; } @@ -88,6 +91,7 @@ @Override public InputFile[] getInputFiles() { - return new InputFile[]{tlbeStationFile, xtblTriFile, tblMensurationFile, tblMensurationClasseFile}; + return new InputFile[]{tlbeStationFile, xtblTriFile, + tblMensurationFile, tblMensurationClasseFile}; } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesIndividualDataImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -46,7 +46,8 @@ protected final InputFile individualDataFile; public CatchesIndividualDataImportConfiguration(Locale locale) { - individualDataFile = InputFile.newFile(l_(locale, "echobase.common.individualDataFile")); + individualDataFile = InputFile.newFile( + l_(locale, "echobase.common.individualDataFile")); } public String getVoyageId() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CatchesReferenceImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -46,8 +46,10 @@ protected final InputFile lengthWeightKeyFile; public CatchesReferenceImportConfiguration(Locale locale) { - lengthAgeKeyFile = InputFile.newFile(l_(locale, "echobase.common.lengthAgeKeyFile")); - lengthWeightKeyFile = InputFile.newFile(l_(locale, "echobase.common.lengthWeightKeyFile")); + lengthAgeKeyFile = InputFile.newFile( + l_(locale, "echobase.common.lengthAgeKeyFile")); + lengthWeightKeyFile = InputFile.newFile( + l_(locale, "echobase.common.lengthWeightKeyFile")); } public InputFile getLengthAgeKeyFile() { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataCompleteImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -45,21 +45,48 @@ /** Selected area of operation to use for voyage. */ protected String areaOfOperationId; + /** Selected vessel to use for transect. */ + protected String vesselId; + /** Manual description of voyage. */ protected String voyageDescription; + /** transit related activity. */ + protected String transitRelatedActivity; + + /** transect license. */ + protected String transectLicence; + + /** transect geospatialVerticalPositive. */ + protected String transectGeospatialVerticalPositive = "down"; + + /** transect binUnitsPingAxis. */ + protected String transectBinUnitsPingAxis = "1 nautical mile"; + /** Manual datum to use in voyage. */ protected String datum = "WGS84"; - /** Casino file to import. */ - protected final InputFile casinoFile; + /** Voyage file to import. */ + protected final InputFile voyageFile; + /** Transit file to import. */ + protected final InputFile transitFile; + + /** Transect file to import. */ + protected final InputFile transectFile; + /** Echotype file to import. */ protected final InputFile echotypeFile; public CommonDataCompleteImportConfiguration(Locale locale) { - casinoFile = InputFile.newFile(l_(locale, "echobase.common.casinoFile")); - echotypeFile = InputFile.newFile(l_(locale, "echobase.common.echotypeFile")); + voyageFile = InputFile.newFile( + l_(locale, "echobase.common.voyageFile")); + transitFile = InputFile.newFile( + l_(locale, "echobase.common.transitFile")); + transectFile = InputFile.newFile( + l_(locale, "echobase.common.transectFile")); + echotypeFile = InputFile.newFile( + l_(locale, "echobase.common.echotypeFile")); } public String getMissionId() { @@ -78,6 +105,14 @@ this.areaOfOperationId = areaOfOperationId; } + public String getVesselId() { + return vesselId; + } + + public void setVesselId(String vesselId) { + this.vesselId = vesselId; + } + public String getVoyageDescription() { return voyageDescription; } @@ -94,16 +129,57 @@ this.datum = datum; } - public InputFile getCasinoFile() { - return casinoFile; + public String getTransitRelatedActivity() { + return transitRelatedActivity; } + public void setTransitRelatedActivity(String transitRelatedActivity) { + this.transitRelatedActivity = transitRelatedActivity; + } + + public String getTransectLicence() { + return transectLicence; + } + + public void setTransectLicence(String transectLicence) { + this.transectLicence = transectLicence; + } + + public String getTransectGeospatialVerticalPositive() { + return transectGeospatialVerticalPositive; + } + + public void setTransectGeospatialVerticalPositive(String transectGeospatialVerticalPositive) { + this.transectGeospatialVerticalPositive = transectGeospatialVerticalPositive; + } + + public String getTransectBinUnitsPingAxis() { + return transectBinUnitsPingAxis; + } + + public void setTransectBinUnitsPingAxis(String transectBinUnitsPingAxis) { + this.transectBinUnitsPingAxis = transectBinUnitsPingAxis; + } + + public InputFile getVoyageFile() { + return voyageFile; + } + + public InputFile getTransitFile() { + return transitFile; + } + + public InputFile getTransectFile() { + return transectFile; + } + public InputFile getEchotypeFile() { return echotypeFile; } @Override public InputFile[] getInputFiles() { - return new InputFile[]{casinoFile, echotypeFile}; + return new InputFile[]{voyageFile, transitFile, + transectFile, echotypeFile}; } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/CommonDataFromTransectImportConfiguration.java 2012-01-15 21:31:49 UTC (rev 283) @@ -42,11 +42,27 @@ /** Selected voyage id where to import datas. */ protected String voyageId; - /** Casino file to import. */ - protected final InputFile casinoFile; + /** Selected vessel to use for transect. */ + protected String vesselId; + /** transect license. */ + protected String transectLicence; + + /** transect geospatialVerticalPositive. */ + protected String transectGeospatialVerticalPositive = "down"; + + /** transect binUnitsPingAxis. */ + protected String transectBinUnitsPingAxis = "1 nautical mile"; + + /** Manual datum to use in voyage. */ + protected String datum = "WGS84"; + + /** Transect file to import. */ + protected final InputFile transectFile; + public CommonDataFromTransectImportConfiguration(Locale locale) { - casinoFile = InputFile.newFile(l_(locale, "echobase.common.casinoFile")); + transectFile = InputFile.newFile( + l_(locale, "echobase.common.transectFile")); } public String getVoyageId() { @@ -57,12 +73,52 @@ this.voyageId = voyageId; } - public InputFile getCasinoFile() { - return casinoFile; + public String getVesselId() { + return vesselId; } + public void setVesselId(String vesselId) { + this.vesselId = vesselId; + } + + public String getDatum() { + return datum; + } + + public void setDatum(String datum) { + this.datum = datum; + } + + public String getTransectLicence() { + return transectLicence; + } + + public void setTransectLicence(String transectLicence) { + this.transectLicence = transectLicence; + } + + public String getTransectGeospatialVerticalPositive() { + return transectGeospatialVerticalPositive; + } + + public void setTransectGeospatialVerticalPositive(String transectGeospatialVerticalPositive) { + this.transectGeospatialVerticalPositive = transectGeospatialVerticalPositive; + } + + public String getTransectBinUnitsPingAxis() { + return transectBinUnitsPingAxis; + } + + public void setTransectBinUnitsPingAxis(String transectBinUnitsPingAxis) { + this.transectBinUnitsPingAxis = transectBinUnitsPingAxis; + } + + public InputFile getTransectFile() { + return transectFile; + } + @Override public InputFile[] getInputFiles() { - return new InputFile[]{casinoFile}; + return new InputFile[]{transectFile}; } } Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-15 21:30:41 UTC (rev 282) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-15 21:31:49 UTC (rev 283) @@ -2,7 +2,7 @@ echobase.common.echotypeFile=Fichier echotype echobase.common.importDataMode.accousticData=Import des données accoustiques echobase.common.importDataMode.accousticRegionData=Import des cellules régions (accoustique) -echobase.common.importDataMode.catchesData=Import des donées de pêche non biométrie +echobase.common.importDataMode.catchesData=Import des données de pêche non biométrie echobase.common.importDataMode.catchesIndividualData=Import des données de pêche biométire echobase.common.importDataMode.catchesReferences=Import du référentiel pêche echobase.common.importDataMode.commonDataComplete=Import de données communes

1 0

r282 - trunk/echobase-entities/src/main/java/fr/ifremer/echobase
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 22:30:41 +0100 (Sun, 15 Jan 2012) New Revision: 282 Url: http://forge.codelutin.com/repositories/revision/echobase/282 Log: remove unused configuration option Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-15 19:39:51 UTC (rev 281) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-15 21:30:41 UTC (rev 282) @@ -47,8 +47,6 @@ protected static final Log log = LogFactory.getLog(EchoBaseConfiguration.class); - public static final String OPTION_CREATE_ADMINS = "createAdmins"; - public static final String OPTION_UPDATE_SCHEMA = "updateSchema"; public static final String OPTION_AUTO_LOGIN = "autoLogin";

1 0

r281 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 20:39:51 +0100 (Sun, 15 Jan 2012) New Revision: 281 Url: http://forge.codelutin.com/repositories/revision/echobase/281 Log: remove commented code Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-15 19:38:46 UTC (rev 280) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-15 19:39:51 UTC (rev 281) @@ -79,16 +79,10 @@ model.setNbSteps(entries.length); -// List<EchoBaseEntityEnum> referenceTypes = -// Arrays.asList(EntitiesUtil.getReferenceTypes()); for (MetaFilenameAware entry : entries) { model.incrementsProgression(); -// if (!referenceTypes.contains(entry.getSource())) { -// // remove this when tests are ok. -// continue; -// } File entryFile = new File(dir, entry.getFilename()); if (entry instanceof AssociationMeta) { AssociationMeta associationMeta = (AssociationMeta) entry; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-15 19:38:46 UTC (rev 280) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-15 19:39:51 UTC (rev 281) @@ -142,21 +142,7 @@ DbEditorService service = getService(DbEditorService.class); TableMeta tableMeta = service.getTableMeta(associationMeta.getSource()); -// long s0 = TimeLog.getTime(); List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, "size(e." + associationMeta.getName() + ") > 0"); -// List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, null); -// timeLog.log(s0, "prepareExport::getEntities"); -// s0 = TimeLog.getTime(); -// EntityOperator<TopiaEntity> operator = associationMeta.getOperator(); -// Iterator<TopiaEntity> itr = datas.iterator(); -// while (itr.hasNext()) { -// TopiaEntity entity = itr.next(); -// int size = operator.sizeChild(associationMeta.getName(), entity); -// if (size == 0) { -// itr.remove(); -// } -// } -// timeLog.log(s0, "prepareExport::removeEmptyChilds"); ExportModel<TopiaEntity> model = buildForExport(associationMeta); return Export.newExport(model, datas); }

1 0

r280 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 20:38:46 +0100 (Sun, 15 Jan 2012) New Revision: 280 Url: http://forge.codelutin.com/repositories/revision/echobase/280 Log: improve csv api Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-01-15 19:38:46 UTC (rev 280) @@ -34,6 +34,12 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; import org.nuiton.util.csv.Common; +import org.nuiton.util.csv.ExportModel; +import org.nuiton.util.csv.ExportableColumn; +import org.nuiton.util.csv.ImportExportModel; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ModelBuilder; import org.nuiton.util.csv.ValueFormatter; import org.nuiton.util.csv.ValueParser; import org.nuiton.util.csv.ValueParserFormatter; @@ -43,6 +49,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; +import java.util.List; import java.util.Locale; import java.util.Map; @@ -106,7 +113,10 @@ } public static final ValueParser<Date> IMPORT_DAY = new DateValue("dd/MM/yy"); + public static final ValueParser<Date> IMPORT_DAY2 = new DateValue("dd-MM-yy"); + public static final ValueParser<Date> TIME = new DateValue("HH:mm:ss"); + public static final ValueParser<Boolean> INT_TO_BOOLEAN_PARSER = new ValueParser<Boolean>() { @Override @@ -285,4 +295,84 @@ protected CsvModelUtil() { // avoid instanciation on helper class } + + public static abstract class AbstractImportModel<E> implements ImportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractImportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public final Iterable<ImportableColumn<E, Object>> getColumnsForImport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + } + + public static abstract class AbstractImportExportModel<E> implements ImportExportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractImportExportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public final Iterable<ExportableColumn<E, Object>> getColumnsForExport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + + @Override + public final Iterable<ImportableColumn<E, Object>> getColumnsForImport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + } + + public static abstract class AbstractExportModel<E> implements ExportModel<E> { + + private final char separator; + + protected final ModelBuilder<E> modelBuilder; + + public AbstractExportModel(char separator) { + this.separator = separator; + modelBuilder = new ModelBuilder<E>(); + } + + @Override + public final char getSeparator() { + return separator; + } + + @Override + public final Iterable<ExportableColumn<E, Object>> getColumnsForExport() { + return (Iterable) modelBuilder.getColumnsForImport(); + } + + } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -26,25 +26,17 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.csv.ExportModel; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import java.util.Collection; - /** * A model to export associations of entities into csv files. * * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class EntityAssociationExportModel<E extends TopiaEntity> implements ExportModel<E> { +public class EntityAssociationExportModel<E extends TopiaEntity> extends CsvModelUtil.AbstractExportModel<E> { - protected final char separator; - protected final AssociationMeta meta; - protected ModelBuilder<E> modelBuilder; - public static <E extends TopiaEntity> ExportModel<E> newExportModel(char separator, AssociationMeta meta ) { @@ -66,21 +58,9 @@ return model; } - @Override - public char getSeparator() { - return separator; - } - - @Override - public Iterable<ExportableColumn<E, Object>> getColumnsForExport() { - return (Collection) - modelBuilder.getColumnsForExport(); - } - protected EntityAssociationExportModel(char separator, AssociationMeta meta) { - this.separator = separator; + super(separator); this.meta = meta; - modelBuilder = new ModelBuilder<E>(); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -26,11 +26,7 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import java.util.Collection; -import java.util.List; import java.util.Map; /** @@ -39,14 +35,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class EntityAssociationImportModel implements ImportModel<Map<String, Object>> { +public class EntityAssociationImportModel extends CsvModelUtil.AbstractImportModel<Map<String, Object>> { - protected final char separator; - protected final AssociationMeta meta; - protected ModelBuilder<Map<String, Object>> modelBuilder; - public static ImportModel<Map<String, Object>> newImportModel(char separator, AssociationMeta meta ) { @@ -70,29 +62,14 @@ } @Override - public char getSeparator() { - return separator; - } - - @Override - public Iterable<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { - return (Collection) - modelBuilder.getColumnsForImport(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - @Override public Map<String, Object> newEmptyInstance() { return null; } - protected EntityAssociationImportModel(char separator, AssociationMeta meta) { - this.separator = separator; + protected EntityAssociationImportModel(char separator, + AssociationMeta meta) { + super(separator); this.meta = meta; - modelBuilder = new ModelBuilder<Map<String, Object>>(); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -26,15 +26,11 @@ import com.google.common.base.Function; import fr.ifremer.echobase.entities.meta.TableMeta; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; import org.nuiton.util.csv.ValueParser; import java.util.Collection; import java.util.Date; -import java.util.List; /** * A model to import / export entities into csv files. @@ -42,14 +38,10 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class EntityCsvModel<E extends TopiaEntity> implements ImportExportModel<E> { +public class EntityCsvModel<E extends TopiaEntity> extends CsvModelUtil.AbstractImportExportModel<E> { - protected final char separator; - protected final TableMeta tableMeta; - protected ModelBuilder<E> modelBuilder; - public static <E extends TopiaEntity> EntityCsvModel<E> newModel( char separator, TableMeta tableMeta @@ -65,27 +57,6 @@ return new EntityCsvModel<E>(separator, tableMeta, idHeader); } - @Override - public char getSeparator() { - return separator; - } - - @Override - public Collection<ExportableColumn<E, Object>> getColumnsForExport() { - return (Collection) - modelBuilder.getColumnsForExport(); - } - - @Override - public Collection<ImportableColumn<E, Object>> getColumnsForImport() { - return (Collection) - modelBuilder.getColumnsForImport(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { return modelBuilder.newIgnoredColumn(headerName); } @@ -252,9 +223,8 @@ protected EntityCsvModel(char separator, TableMeta tableMeta) { - this.separator = separator; + super(separator); this.tableMeta = tableMeta; - modelBuilder = new ModelBuilder<E>(); } protected EntityCsvModel(char separator, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java 2012-01-15 19:37:20 UTC (rev 279) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java 2012-01-15 19:38:46 UTC (rev 280) @@ -24,13 +24,7 @@ package fr.ifremer.echobase.services.csv; import fr.ifremer.echobase.services.ExportQueryService; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import java.util.Collection; -import java.util.List; import java.util.Map; /** @@ -39,16 +33,11 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class ExportQueryCsvModel implements ImportExportModel<Map<String, Object>> { +public class ExportQueryCsvModel extends CsvModelUtil.AbstractExportModel<Map<String, Object>> { - protected final char separator; - - protected final ModelBuilder<?> modelBuilder; - public ExportQueryCsvModel(char separator, String[] columnHeaders) { - this.separator = separator; - modelBuilder = new ModelBuilder<Object>(); + super(separator); for (String columnHeader : columnHeaders) { modelBuilder.newColumnForExport( columnHeader, @@ -58,29 +47,4 @@ } } - @Override - public char getSeparator() { - return separator; - } - - @Override - public Collection<ExportableColumn<Map<String, Object>, Object>> getColumnsForExport() { - return (Collection) modelBuilder.getColumnsForExport(); - } - - @Override - public Collection<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { - // never do import from this model - throw new UnsupportedOperationException(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - @Override - public Map<String, Object> newEmptyInstance() { - // never do import from this model - throw new UnsupportedOperationException(); - } }

1 0

r279 - in trunk: echobase-entities/src/main/resources/i18n echobase-entities/src/main/xmi echobase-services/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 15 Jan '12

15 Jan '12

Author: tchemit Date: 2012-01-15 20:37:20 +0100 (Sun, 15 Jan 2012) New Revision: 279 Url: http://forge.codelutin.com/repositories/revision/echobase/279 Log: add some order on some associations + i18n Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-entities/src/main/xmi/echobase.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -130,7 +130,6 @@ echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= -echobase.common.m= echobase.common.maxDepth= echobase.common.maxFishLength= echobase.common.maxLatitude= @@ -156,7 +155,6 @@ echobase.common.modificationDate=Date de modification echobase.common.modificationText=Modification echobase.common.modificationUser=Utilisateur -echobase.common.mz= echobase.common.name=Nom echobase.common.noiseDesign= echobase.common.notes= @@ -166,7 +164,6 @@ echobase.common.operationEvent= echobase.common.operationMetadata= echobase.common.operationMetadataValue= -echobase.common.operationType= echobase.common.operator= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements echobase.common.organisationReferences=Références organisation @@ -188,7 +185,6 @@ echobase.common.qualityDataFlagValues= echobase.common.r2= echobase.common.raptriBiometryDataType= -echobase.common.reference= echobase.common.referenceDatum=referenceDatum echobase.common.referenceDatumType= echobase.common.referencingMethod= Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -32,6 +32,14 @@ model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true +# ordered +fr.ifremer.echobase.entities.data.Voyage.attribute.transit.stereotype=ordered +fr.ifremer.echobase.entities.data.Voyage.attribute.transit.tagvalue.orderBy=startTime +fr.ifremer.echobase.entities.data.Transit.attribute.transect.stereotype=ordered +fr.ifremer.echobase.entities.data.Transit.attribute.transect.tagvalue.orderBy=timeCoverageStart +fr.ifremer.echobase.entities.data.Transect.attribute.operation.stereotype=ordered +fr.ifremer.echobase.entities.data.Transect.attribute.operation.tagvalue.orderBy=gearShootingStartTime + # big text zone fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationText.tagvalue.type=text Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-13 17:45:03 UTC (rev 278) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-01-15 19:37:20 UTC (rev 279) @@ -1,5 +1,4 @@ echobase.common.associationFile=Fichier d'associations de cellules -echobase.common.casinoFile=Fichier Casino echobase.common.echotypeFile=Fichier echotype echobase.common.importDataMode.accousticData=Import des données accoustiques echobase.common.importDataMode.accousticRegionData=Import des cellules régions (accoustique) @@ -17,4 +16,7 @@ echobase.common.tblMensurationClasseFile=Fichier de classes de mensuration echobase.common.tblMensurationFile=Fichier de mensuration echobase.common.tlbeStationFile=Fichier des stations +echobase.common.transectFile=Fichier des transects +echobase.common.transitFile=Fichier des transits +echobase.common.voyageFile=Fichier des voayges echobase.common.xtblTriFile=Fichier Tri

1 0

r278 - trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 18:45:03 +0100 (Fri, 13 Jan 2012) New Revision: 278 Url: http://forge.codelutin.com/repositories/revision/echobase/278 Log: fix compile Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java 2012-01-13 17:41:09 UTC (rev 277) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/CellLoaderIT.java 2012-01-13 17:45:03 UTC (rev 278) @@ -45,6 +45,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.nuiton.topia.TopiaException; +import org.nuiton.util.TimeLog; import java.io.File; import java.io.IOException; @@ -66,6 +67,8 @@ private static final Log log = LogFactory.getLog(CellLoaderIT.class); + public static final TimeLog TIME_LOG = new TimeLog(DbEditorService.class); + /** Id of data processing to treat. */ private String dataProcessingId; @@ -130,7 +133,7 @@ super.tearDown(); if (log.isInfoEnabled()) { - log.info("TimeLogs : " + DbEditorService.timeLog.getCallCount()); + log.info("TimeLogs : " + TIME_LOG.getCallCount()); } }

1 0

r277 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 18:41:09 +0100 (Fri, 13 Jan 2012) New Revision: 277 Url: http://forge.codelutin.com/repositories/revision/echobase/277 Log: fix more sonar errors Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:41:09 UTC (rev 277) @@ -41,7 +41,6 @@ import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.TimeLog; import org.nuiton.util.beans.BeanMonitor; import org.nuiton.util.beans.PropertyDiff; import org.nuiton.util.csv.ExportableColumn; @@ -63,8 +62,6 @@ /** Logger. */ private static final Log log = LogFactory.getLog(DbEditorService.class); - public static final TimeLog timeLog = new TimeLog(DbEditorService.class); - protected DecoratorService getDecoratorService() { return getService(DecoratorService.class); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-13 17:41:09 UTC (rev 277) @@ -50,7 +50,7 @@ /** Logger. */ private static final Log log = LogFactory.getLog(ExportService.class); - public static final TimeLog timeLog = new TimeLog(ExportService.class); + public static final TimeLog TIME_LOG = new TimeLog(ExportService.class); public <E extends TopiaEntity> ExportModel<E> buildForExport(AssociationMeta associationMeta) { @@ -101,14 +101,14 @@ } long s1 = TimeLog.getTime(); Export<TopiaEntity> export = prepareExport(tableMeta); - timeLog.log(s1, "exportDatas::prepareExport"); + TIME_LOG.log(s1, "exportDatas::prepareExport"); long s2 = TimeLog.getTime(); try { export.exportToFile(file); } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); } - timeLog.log(s2, "exportDatas::exportToFile"); + TIME_LOG.log(s2, "exportDatas::exportToFile"); } public void exportDatas(AssociationMeta associationMeta, File file) { @@ -118,7 +118,7 @@ } long s1 = TimeLog.getTime(); Export<TopiaEntity> export = prepareExport(associationMeta); - timeLog.log(s1, "exportDatas::prepareExport"); + TIME_LOG.log(s1, "exportDatas::prepareExport"); long s2 = TimeLog.getTime(); try { @@ -126,7 +126,7 @@ } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); } - timeLog.log(s2, "exportDatas::exportToFile"); + TIME_LOG.log(s2, "exportDatas::exportToFile"); } protected Export<TopiaEntity> prepareExport(TableMeta tableMeta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-13 17:41:09 UTC (rev 277) @@ -66,7 +66,7 @@ private static final Log log = LogFactory.getLog(ImportDbService.class); - public static final TimeLog timeLog = new TimeLog(ImportDbService.class); + public static final TimeLog TIME_LOG = new TimeLog(ImportDbService.class); /** * Import a complete db from the given zip file. @@ -153,12 +153,9 @@ result.put(entry, zipEntry); } } - if (!missingEntries.isEmpty()) { - - if (log.isWarnEnabled()) { - log.warn("There is " + missingEntries.size() + " missing files " + - " in import " + file + "\n" + StringUtil.join(missingEntries, "\n", false)); - } + if (!missingEntries.isEmpty() && log.isWarnEnabled()) { + log.warn("There is " + missingEntries.size() + " missing files " + + " in import " + file + "\n" + StringUtil.join(missingEntries, "\n", false)); } return result; @@ -219,13 +216,13 @@ } } - timeLog.log(s0, "importFile::done"); + TIME_LOG.log(s0, "importFile::done"); s0 = TimeLog.getTime(); flushTransaction(); - timeLog.log(s0, "importFile::flushTransaction"); + TIME_LOG.log(s0, "importFile::flushTransaction"); } protected void importEntityFile(TableMeta meta, Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java 2012-01-13 17:29:04 UTC (rev 276) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleLoader.java 2012-01-13 17:41:09 UTC (rev 277) @@ -314,26 +314,18 @@ } } - if (!operationNotFound.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("operation not found : \n" + StringUtil.join(operationNotFound, "\n", false)); - } + if (!operationNotFound.isEmpty() && log.isWarnEnabled()) { + log.warn("operation not found : \n" + StringUtil.join(operationNotFound, "\n", false)); } - if (!ntotNull.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("NTOT is null for operation :\n" + StringUtil.join(ntotNull, "\n", false)); - } + if (!ntotNull.isEmpty() && log.isWarnEnabled()) { + log.warn("NTOT is null for operation :\n" + StringUtil.join(ntotNull, "\n", false)); } - if (!pmensNull.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("PESP_MENS is null for operation\n" + StringUtil.join(pmensNull, "\n", false)); - } + if (!pmensNull.isEmpty() && log.isWarnEnabled()) { + log.warn("PESP_MENS is null for operation\n" + StringUtil.join(pmensNull, "\n", false)); } - if (!valeurBiometryNull.isEmpty()) { - if (log.isWarnEnabled()) { - log.warn("Null value of VALEUR_BIOMETRIE for operationId/Species/Individu/Code param\n" + StringUtil.join(valeurBiometryNull, "\n", false)); - } + if (!valeurBiometryNull.isEmpty() && log.isWarnEnabled()) { + log.warn("Null value of VALEUR_BIOMETRIE for operationId/Species/Individu/Code param\n" + StringUtil.join(valeurBiometryNull, "\n", false)); } if (log.isInfoEnabled()) { log.info("Found " + nbSampleTotal + " 'total' sample(s).");

1 0

r276 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-services/src/main/java/fr/ifremer/echobase/services echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 18:29:04 +0100 (Fri, 13 Jan 2012) New Revision: 276 Url: http://forge.codelutin.com/repositories/revision/echobase/276 Log: fix more sonar errors Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-13 17:29:04 UTC (rev 276) @@ -156,7 +156,7 @@ * @param key the configuration option key which contains the location of * the directory to create */ - protected void createDirectory(EchoBaseConfigurationOption key) { + private void createDirectory(EchoBaseConfigurationOption key) { File directory = applicationConfig.getOptionAsFile(key.getKey()); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-01-13 17:29:04 UTC (rev 276) @@ -226,4 +226,8 @@ return result; } + protected EntitiesUtil() { + // avoid to instanciate helper class + } + } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:29:04 UTC (rev 276) @@ -202,13 +202,13 @@ try { o = column.parseValue(stringValue); } catch (Exception e) { - throw new EchoBaseTechnicalException("Could not parse property [" + propertyName + "] with value " + stringValue); + throw new EchoBaseTechnicalException("Could not parse property [" + propertyName + "] with value " + stringValue, e); } try { column.setValue(entity, o); } catch (Exception e) { throw new EchoBaseTechnicalException( - "Could not set property [" + propertyName + "] with value " + stringValue + " to entity " + entity); + "Could not set property [" + propertyName + "] with value " + stringValue + " to entity " + entity, e); } } @@ -303,7 +303,7 @@ String topiaId = entity.getTopiaId(); - buffer = new StringBuilder(messagePrefix + "\n"); + buffer = new StringBuilder(messagePrefix).append('\n'); if (monitor == null) { // no monitor, means this is a creation of an object Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -71,7 +71,7 @@ TopiaDAO<DataAcquisition> dao = getDAO(); - Map<String, Map<String, Object>> EI_SONDEURByVesselName = Maps.uniqueIndex( + Map<String, Map<String, Object>> eI_SONDEURByVesselName = Maps.uniqueIndex( db.getTable("EI_SONDEUR"), EchoBaseFunctions.newRowFunction("ID_REFSONDEUR")); List<DataAcquisition> dataAcquisitions = Lists.newArrayList(); @@ -87,7 +87,7 @@ AcousticInstrument acousticInstrument = getFK( acousticInstrumentsByName, acousticInstrumentId); Map<String, Object> sondeurRow = getFK( - EI_SONDEURByVesselName, acousticInstrumentId); + eI_SONDEURByVesselName, acousticInstrumentId); Float transceiverAcquisitionAbsorption = (Float) sondeurRow.get("ALPHA"); Float transceiverAcquisitionPower = (Float) sondeurRow.get("PUISSANCE_MAX"); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -35,8 +35,6 @@ import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Import; import java.io.File; @@ -52,9 +50,6 @@ */ public class EchotypeLoader extends EntityLoader<Echotype> { - /** Logger. */ - private static final Log log = LogFactory.getLog(EchotypeLoader.class); - public EchotypeLoader() { super(Echotype.class, new EchoBaseEntityEnum[]{EchoBaseEntityEnum.Species}, Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -205,9 +205,9 @@ log.info("Import " + entityType + " from " + csvfile); } - TableMeta meta = getTable(entityType); + TableMeta tableMeta = getTable(entityType); - EntityCsvModel<E> csvModel = createCsvImportModel(meta); + EntityCsvModel<E> csvModel = createCsvImportModel(tableMeta); BufferedReader bf = new BufferedReader(new FileReader(csvfile)); try { @@ -218,7 +218,7 @@ DbEditorService dbEditorService = getService(DbEditorService.class); - importNewEntities(dbEditorService, meta, importer); + importNewEntities(dbEditorService, tableMeta, importer); } finally { importer.close(); @@ -232,9 +232,6 @@ bf.close(); } -// File out = getTableFile(outputDir, meta, FileType.NEW); -// getExportService().exportDatas(meta, out); - exportDatas(outputDir, FileType.NEW); exportAssociations(outputDir, FileType.ASSOCIATION); @@ -245,7 +242,9 @@ } } - protected void importNewEntities(DbEditorService dbEditorService, TableMeta meta, Import<E> importer) { + protected void importNewEntities(DbEditorService dbEditorService, + TableMeta meta, + Import<E> importer) { for (E entity : importer) { dbEditorService.saveEntity(meta, @@ -291,7 +290,9 @@ } } - protected void exportData(File outputDir, FileType targetType, TableMeta meta) throws IOException { + protected void exportData(File outputDir, + FileType targetType, + TableMeta meta) throws IOException { File out = getTableFile(outputDir, meta, targetType); @@ -322,7 +323,8 @@ return new File(parentDir, meta.getFilename()); } - public void copyStreamToFile(File file, FileType fileType) throws IOException { + public void copyStreamToFile(File file, + FileType fileType) throws IOException { String path = "/csv/" + fileType.name().toLowerCase() + "/" + file.getName(); InputStream stream = getClass().getResourceAsStream(path); @@ -352,9 +354,10 @@ File out = getTableFile(directory, meta, fileType); copyStreamToFile(out, fileType); - CsvImportResult result = CsvImportResult.newResult(meta.getSource(), - out.getAbsolutePath(), - true); + CsvImportResult result = CsvImportResult.newResult( + meta.getSource(), + out.getAbsolutePath(), + true); BufferedReader bf = new BufferedReader(new FileReader(out)); try { @@ -425,20 +428,20 @@ // load a association input - AssociationMeta meta = (AssociationMeta) entry; + AssociationMeta associationMeta = (AssociationMeta) entry; if (log.isInfoEnabled()) { - log.info("Will import " + meta); + log.info("Will import " + associationMeta); } - EchoBaseEntityEnum target = meta.getTarget(); + EchoBaseEntityEnum target = associationMeta.getTarget(); List<TopiaEntity> targetEntities = getEntities(target); Map<String, TopiaEntity> targetsById = Maps.uniqueIndex(targetEntities, EchoBaseFunctions.TO_TOPIAID); - ImportModel<Map<String, Object>> model = service.buildForImport(meta); + ImportModel<Map<String, Object>> model = service.buildForImport(associationMeta); - EchoBaseEntityEnum sourceType = meta.getSource(); + EchoBaseEntityEnum sourceType = associationMeta.getSource(); ImportToMap importer = ImportToMap.newImport(model, reader); @@ -455,7 +458,7 @@ TopiaEntity targetEntity = targetsById.get(association); associationEntities.add(targetEntity); } - meta.setChilds(e, associationEntities); + associationMeta.setChilds(e, associationEntities); csvResult.incrementsNumberUpdated(); } @@ -468,29 +471,31 @@ // normal entity table import - TableMeta meta = (TableMeta) entry; + TableMeta tableMeta = (TableMeta) entry; if (log.isInfoEnabled()) { - log.info("Will import " + meta); + log.info("Will import " + tableMeta); } - ImportModel<TopiaEntity> model = service.buildForImport(meta); + ImportModel<TopiaEntity> model = service.buildForImport(tableMeta); Import<TopiaEntity> importer = Import.newImport(model, reader); try { - TopiaDAO<TopiaEntity> dao = getDAO(meta.getSource()); + TopiaDAO<TopiaEntity> dao = getDAO(tableMeta.getSource()); for (TopiaEntity entity : importer) { TopiaEntity entityToSave = dao.create(TopiaEntity.TOPIA_ID, entity.getTopiaId()); - meta.copy(entity, entityToSave); + tableMeta.copy(entity, entityToSave); csvResult.incrementsNumberUpdated(); } } catch (Exception eee) { - throw new EchoBaseTechnicalException("Could not import entities of type " + meta.getSource(), eee); + throw new EchoBaseTechnicalException( + "Could not import entities of type " + + tableMeta.getSource(), eee); } finally { importer.close(); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -122,20 +122,20 @@ } //SONDE - OperationMetadata MeanWaterDepthOperationMeta; + OperationMetadata meanWaterDepthOperationMeta; //JOUR_NUIT - OperationMetadata DielPeriodOperationMeta; + OperationMetadata dielPeriodOperationMeta; //SONDEDEB - OperationMetadata StartWaterDepthOperationMeta; + OperationMetadata startWaterDepthOperationMeta; //SONDEFIN - OperationMetadata EndWaterDepthOperationMeta; + OperationMetadata endWaterDepthOperationMeta; //LFUNES - GearMetadata CableLengthGearMeta; + GearMetadata cableLengthGearMeta; //VMIN - GearMetadata MinSpeedGearMeta; + GearMetadata minSpeedGearMeta; //VMAX - GearMetadata MaxSpeedGearMeta; + GearMetadata maxSpeedGearMeta; TopiaDAO<Operation> dao; TopiaDAO<OperationMetadataValue> operationMetadataValueDAO; @@ -161,38 +161,38 @@ (OperationMetadataDAO) getDAO(OperationMetadata.class); //SONDE - MeanWaterDepthOperationMeta = + meanWaterDepthOperationMeta = operationMetadataDAO.findByName("MeanWaterDepth"); - Preconditions.checkNotNull(MeanWaterDepthOperationMeta); + Preconditions.checkNotNull(meanWaterDepthOperationMeta); //JOUR_NUIT - DielPeriodOperationMeta = + dielPeriodOperationMeta = operationMetadataDAO.findByName("DielPeriod"); - Preconditions.checkNotNull(DielPeriodOperationMeta); + Preconditions.checkNotNull(dielPeriodOperationMeta); //SONDEDEB - StartWaterDepthOperationMeta = operationMetadataDAO.findByProperties( + startWaterDepthOperationMeta = operationMetadataDAO.findByProperties( OperationMetadata.PROPERTY_NAME, "WaterDepth", OperationMetadata.PROPERTY_OPERATION_EVENT + "." + OperationEvent.PROPERTY_NAME, "ShootingStart" ); - Preconditions.checkNotNull(StartWaterDepthOperationMeta); + Preconditions.checkNotNull(startWaterDepthOperationMeta); //SONDEFIN - EndWaterDepthOperationMeta = operationMetadataDAO.findByProperties( + endWaterDepthOperationMeta = operationMetadataDAO.findByProperties( OperationMetadata.PROPERTY_NAME, "WaterDepth", OperationMetadata.PROPERTY_OPERATION_EVENT + "." + OperationEvent.PROPERTY_NAME, "HaulingEnd" ); - Preconditions.checkNotNull(EndWaterDepthOperationMeta); + Preconditions.checkNotNull(endWaterDepthOperationMeta); GearMetadataDAO gearMetadataDAO = (GearMetadataDAO) getDAO(GearMetadata.class); //LFUNES - CableLengthGearMeta = gearMetadataDAO.findByType("CableLength"); - Preconditions.checkNotNull(CableLengthGearMeta); + cableLengthGearMeta = gearMetadataDAO.findByType("CableLength"); + Preconditions.checkNotNull(cableLengthGearMeta); //VMIN - MinSpeedGearMeta = gearMetadataDAO.findByType("MinSpeed"); - Preconditions.checkNotNull(MinSpeedGearMeta); + minSpeedGearMeta = gearMetadataDAO.findByType("MinSpeed"); + Preconditions.checkNotNull(minSpeedGearMeta); //VMAX - MaxSpeedGearMeta = gearMetadataDAO.findByType("MaxSpeed"); - Preconditions.checkNotNull(MaxSpeedGearMeta); + maxSpeedGearMeta = gearMetadataDAO.findByType("MaxSpeed"); + Preconditions.checkNotNull(maxSpeedGearMeta); dao = getDAO(); operationMetadataValueDAO = getDAO(OperationMetadataValue.class); @@ -324,31 +324,31 @@ ); addOperationMetadataValue(operation, - MeanWaterDepthOperationMeta, + meanWaterDepthOperationMeta, row.get("SONDE")); addOperationMetadataValue(operation, - DielPeriodOperationMeta, + dielPeriodOperationMeta, row.get("JOUR_NUIT")); addOperationMetadataValue(operation, - StartWaterDepthOperationMeta, + startWaterDepthOperationMeta, row.get("SONDEDEB")); addOperationMetadataValue(operation, - EndWaterDepthOperationMeta, + endWaterDepthOperationMeta, row.get("SONDEFIN")); addGearMetadataValue(operation, - CableLengthGearMeta, + cableLengthGearMeta, row.get("LFUNES")); addGearMetadataValue(operation, - MinSpeedGearMeta, + minSpeedGearMeta, row.get("VMIN")); addGearMetadataValue(operation, - MaxSpeedGearMeta, + maxSpeedGearMeta, row.get("VMAX")); return operation; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-13 17:29:04 UTC (rev 276) @@ -73,11 +73,11 @@ public void load() throws Exception { entityTypes = Maps.newTreeMap(); DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); - for (TableMeta tableMeta : dbMeta) { + for (TableMeta meta : dbMeta) { // keep only editable metas - if (dbMeta.isEditable(tableMeta)) { - String name = tableMeta.getName(); + if (dbMeta.isEditable(meta)) { + String name = meta.getName(); entityTypes.put(name, name); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-13 17:29:04 UTC (rev 276) @@ -50,8 +50,8 @@ /** id of entity to save. */ protected String topiaId; - /** Metas of the table */ - protected TableMeta tableMeta; +// /** Metas of the table */ +// protected TableMeta tableMeta; protected Map<String, String[]> params; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2012-01-13 17:29:04 UTC (rev 276) @@ -56,15 +56,15 @@ } public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToCreate = getUser(); + String userEmail = userToCreate.getEmail(); if (log.isInfoEnabled()) { log.info("will create user " + userEmail); } // create user - getUserService().createOrUpdate(user); + getUserService().createOrUpdate(userToCreate); // add info message addActionMessage(_("echobase.info.user.create", userEmail)); @@ -74,8 +74,8 @@ @Override public void validate() { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToValidate = getUser(); + String userEmail = userToValidate.getEmail(); // login + password required if (StringUtils.isEmpty(userEmail)) { @@ -101,7 +101,7 @@ } } - String userPassword = user.getPassword(); + String userPassword = userToValidate.getPassword(); if (StringUtils.isEmpty(userPassword)) { // empty user password Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-01-13 17:29:04 UTC (rev 276) @@ -58,15 +58,15 @@ public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToDelete = getUser(); + String userEmail = userToDelete.getEmail(); if (log.isInfoEnabled()) { log.info("will delete user " + userEmail); } // delete user - getUserService().delete(user); + getUserService().delete(userToDelete); // add info message addActionMessage(_("echobase.info.user.delete", userEmail)); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-01-13 17:29:04 UTC (rev 276) @@ -58,15 +58,15 @@ @Override public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToUpdate = getUser(); + String userEmail = userToUpdate.getEmail(); if (log.isInfoEnabled()) { log.info("will update user " + userEmail); } // update user - getUserService().createOrUpdate(user); + getUserService().createOrUpdate(userToUpdate); // add info message addActionMessage(_("echobase.info.user.update", userEmail)); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-01-13 17:29:04 UTC (rev 276) @@ -65,8 +65,8 @@ boolean autoLogin = EchoBaseActionSupport.getEchoBaseApplicationContext() - .getConfiguration() - .getOptionAsBoolean(EchoBaseConfiguration.OPTION_AUTO_LOGIN); + .getConfiguration() + .getOptionAsBoolean(EchoBaseConfiguration.OPTION_AUTO_LOGIN); if (autoLogin) { // by-pass login @@ -74,12 +74,12 @@ if (log.isInfoEnabled()) { log.info("AutotLogin with admin/admin user"); } - LoginAction loginAction = new LoginAction(); - loginAction.setSession(invocation.getInvocationContext().getSession()); - loginAction.setEmail("admin"); - loginAction.setPassword("admin"); + LoginAction logAction = new LoginAction(); + logAction.setSession(invocation.getInvocationContext().getSession()); + logAction.setEmail("admin"); + logAction.setPassword("admin"); try { - loginAction.doLogin(); + logAction.doLogin(); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Could not auto-login", eee);

1 0

r275 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/configurations echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 18:06:50 +0100 (Fri, 13 Jan 2012) New Revision: 275 Url: http://forge.codelutin.com/repositories/revision/echobase/275 Log: fix sonar errors Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-01-13 15:49:20 UTC (rev 274) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-01-13 17:06:50 UTC (rev 275) @@ -27,6 +27,7 @@ import java.io.File; import java.io.IOException; +import java.util.Arrays; /** * Configuration of a embedded application creation. @@ -82,7 +83,7 @@ } public void setVoyageIds(String[] voyageIds) { - this.voyageIds = voyageIds; + this.voyageIds = Arrays.copyOf(voyageIds, voyageIds.length); } public File getWarLocation() { Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2012-01-13 15:49:20 UTC (rev 274) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2012-01-13 17:06:50 UTC (rev 275) @@ -90,7 +90,7 @@ /** Logger. */ private static final Log log = LogFactory.getLog(CellLoader.class); - public static final DateFormat DATE_FORMAT = + public final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss'Z'"); public static final String SURF_REGION = "SURF"; @@ -461,7 +461,7 @@ // already treated continue; } - String cellStringId = DATE_FORMAT.format(cellId); + String cellStringId = dateFormat.format(cellId); if (log.isDebugEnabled()) { log.debug("Treat esdu " + cellStringId); } @@ -493,7 +493,7 @@ continue; } - String cellStringId = DATE_FORMAT.format(cellId); + String cellStringId = dateFormat.format(cellId); if (log.isDebugEnabled()) { log.debug("Treat esdu " + cellStringId); } Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 15:49:20 UTC (rev 274) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:06:50 UTC (rev 275) @@ -64,6 +64,7 @@ import java.io.Reader; import java.io.Writer; import java.text.ParseException; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; @@ -127,7 +128,8 @@ this.fileTypes = Sets.newHashSet(fileTypes); this.parent = parent; this.parentAssociationName = parentAssociationName; - this.extraDependencies = extraDependencies; + Preconditions.checkNotNull(extraDependencies); + this.extraDependencies = Arrays.copyOf(extraDependencies, extraDependencies.length); } @Override

1 0

r274 - trunk
by tchemit＠users.forge.codelutin.com 13 Jan '12

13 Jan '12

Author: tchemit Date: 2012-01-13 16:49:20 +0100 (Fri, 13 Jan 2012) New Revision: 274 Url: http://forge.codelutin.com/repositories/revision/echobase/274 Log: updates plugins and dev Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-13 10:45:03 UTC (rev 273) +++ trunk/pom.xml 2012-01-13 15:49:20 UTC (rev 274) @@ -79,7 +79,8 @@ <scm> <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + <connection> + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk @@ -107,21 +108,21 @@  <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.5</topiaVersion> - <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> + <topiaVersion>2.6.6</topiaVersion> + <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.9.1</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.1.1</struts2Version> <jqueryPluginVersion>3.2.1</jqueryPluginVersion> - <seleniumVersion>2.15.0</seleniumVersion> - <h2Version>1.3.162</h2Version> - <postgresqlVersion>9.1-901.jdbc4</postgresqlVersion> + <seleniumVersion>2.16.1</seleniumVersion> + <h2Version>1.3.163</h2Version> + <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.6.4</slf4jVersion> - <jettyVersion>7.5.3.v20111011</jettyVersion> - <jackcessVersion>1.2.0</jackcessVersion> +  + <jackcessVersion>1.2.6</jackcessVersion>  -  + <jettyVersion>8.1.0.RC2</jettyVersion> <hibernateVersion>3.6.9.Final</hibernateVersion> @@ -308,7 +309,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>10.0.1</version> + <version>11.0.1</version> </dependency> <dependency> @@ -432,10 +433,11 @@ <version>${nuitonI18nVersion}</version> </plugin> +  <plugin> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </plugin> </plugins>

1 0