Author: tchemit Date: 2013-11-04 08:52:33 +0100 (Mon, 04 Nov 2013) New Revision: 883 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/883 Log: clean code, optimize i18n Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/src/site/rst/db.rst Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2013-11-04 07:52:33 UTC (rev 883) @@ -54,36 +54,4 @@ return (TopiaDAO<E>) getDAO(tx, type.getContract()); } -// public final void flushTransaction(TopiaContext tx, String errorMessage) { -// try { -// tx.getHibernateSession().flush(); -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException(errorMessage, e); -// } -// } - -// public boolean canUpdatePostgis(TopiaContext tx) { -// String dialect = tx.getHibernateConfiguration().getProperty(TopiaContextFactory.CONFIG_DIALECT); -// -// return DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); -// } - -// public boolean isSpatialAware(TopiaContext tx) { -// boolean result = canUpdatePostgis(tx); -// -// if (result) { -// -// // on pg db, check there is now a echobase_spatial_cell -// try { -// ((TopiaSqlSupport) tx).executeSQL("select count(*) from echobase_cell_spatial;"); -// } catch (Exception e) { -// // table not found (or other, ...) -// result = false; -// // rollback (otherwise transaction will stay dirty) -// ((TopiaTransaction) tx).rollbackTransaction(); -// } -// } -// return result; -// } - } Modified: trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties =================================================================== --- trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties 2013-11-04 07:52:33 UTC (rev 883) @@ -16,8 +16,6 @@ echobase.common.importType.operation.short=Operation echobase.common.importType.resultsEsdu=Import the “ESDU” cells results echobase.common.importType.resultsEsdu.short=R ESDU -echobase.common.importType.resultsMap=Import the “map” cells results -echobase.common.importType.resultsMap.short=Map echobase.common.importType.resultsMapFish=Import the “map (fishes)” cells results echobase.common.importType.resultsMapFish.short=Map (fishes) echobase.common.importType.resultsMapOther=Import the “map (others)” cells results Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DefaultEchoBaseServiceContext.java 2013-11-04 07:52:33 UTC (rev 883) @@ -52,36 +52,23 @@ protected EchoBaseDbMeta dbMeta; -// private SpatialDataCache spatialCache; - public static EchoBaseServiceContext newContext( Locale locale, EchoBaseConfiguration configuration, EchoBaseDbMeta dbMeta) { -// , -// SpatialDataCache spatialCache) { return new DefaultEchoBaseServiceContext(locale, configuration, dbMeta); -// , -// spatialCache); } protected DefaultEchoBaseServiceContext(Locale locale, EchoBaseConfiguration configuration, EchoBaseDbMeta dbMeta) { -// SpatialDataCache spatialCache) { this.locale = locale; this.configuration = configuration; this.dbMeta = dbMeta; -// this.spatialCache = spatialCache; } -// @Override -// public SpatialDataCache getSpatialDataCache() { -// return spatialCache; -// } - @Override public TopiaEchoBasePersistenceContext getEchoBasePersistenceContext() { return echoBasePersistenceContext; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceContext.java 2013-11-04 07:52:33 UTC (rev 883) @@ -42,8 +42,6 @@ */ public interface EchoBaseServiceContext { -// SpatialDataCache getSpatialDataCache(); - TopiaEchoBasePersistenceContext getEchoBasePersistenceContext(); void setEchoBasePersistenceContext(TopiaEchoBasePersistenceContext internalPersistenceContext); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-11-04 07:52:33 UTC (rev 883) @@ -74,10 +74,6 @@ return serviceContext.getWorkgingDbUrl(); } -// protected final SpatialDataCache getSpatialDataCache() { -// return serviceContext.getSpatialDataCache(); -// } - protected final Locale getLocale() { return serviceContext.getLocale(); } @@ -138,9 +134,4 @@ return newService(ExportQueryService.class); } -// public final <E extends EchoBaseService> E getService(Class<E> serviceClass) { -// E result = serviceContext.newService(serviceClass); -// return result; -// } - } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java 2013-11-04 07:52:33 UTC (rev 883) @@ -117,11 +117,6 @@ // do commit getEchoBasePersistenceContext().commitTransaction(); -// // revoke spatial data memory cache -// getSpatialDataCache().onVoyageChanged( -// serviceContext.getWorkgingDbUrl(), -// configuration.getVoyageId()); - // update sql spatial data getSpatialService().updatePostgisTable(); @@ -260,36 +255,6 @@ } } -// protected <E extends TopiaEntity> E create(TopiaDAO<E> dao) { -// try { -// E result = dao.create(); -// return result; -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException("Could not create entity", e); -// } -// } - -// protected <E extends TopiaEntity> E create(TopiaDAO<E> dao, E entity) { -// try { -// E result = dao.create(entity); -// return result; -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException("Could not create entity", e); -// } -// } - -// protected <E extends TopiaEntity> E findByProperties(TopiaDAO<E> dao, -// String propertyName, -// Object value, -// Object... others) { -// try { -// E result = dao.findByProperties(propertyName, value, others); -// return result; -// } catch (TopiaException e) { -// throw new EchoBaseTechnicalException("Could not obtain query db", e); -// } -// } - protected String getImportMessage(M configuration, InputFile inputFile) { String message = l_(getLocale(), "echobase.importLabel.withFile", getImportLabel(configuration), inputFile.getFileName()); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java 2013-11-04 07:52:33 UTC (rev 883) @@ -71,10 +71,6 @@ if (ImportDbMode.REFERENTIAL != importDbMode) { -// // revoke all spatial data cache for all this db -// getSpatialDataCache().onDbChanged( -// serviceContext.getWorkgingDbUrl()); - // let's update postgis table getSpatialService().updatePostgisTable(); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2013-11-04 07:52:33 UTC (rev 883) @@ -109,64 +109,56 @@ public Set<SpatialData> getSpatialData(SpatialConfiguration model) { -// SpatialDataCache cache = getSpatialDataCache(); -// -// Set<SpatialData> result = cache.get(model); Set<SpatialData> result = null; - if (result == null) { + String voyageId = model.getVoyageId(); - String voyageId = model.getVoyageId(); + String dataMetadataId = model.getDataMetadataId(); + String cellTypeId = model.getCellTypeId(); - String dataMetadataId = model.getDataMetadataId(); - String cellTypeId = model.getCellTypeId(); + String speciesId = model.getSpeciesId(); + String echotypeId = model.getEchotypeId(); - String speciesId = model.getSpeciesId(); - String echotypeId = model.getEchotypeId(); + TopiaEchoBasePersistenceContext persistenceContext = getEchoBasePersistenceContext(); - TopiaEchoBasePersistenceContext persistenceContext = getEchoBasePersistenceContext(); + Voyage voyage = persistenceContext.getEntityById(Voyage.class, voyageId); - Voyage voyage = persistenceContext.getEntityById(Voyage.class, voyageId); + Preconditions.checkNotNull( + voyage, + "Could not find voyage with id " + voyageId); - Preconditions.checkNotNull( - voyage, - "Could not find voyage with id " + voyageId); + DataMetadata dataMetadata = + persistenceContext.getEntityById(DataMetadata.class, dataMetadataId); - DataMetadata dataMetadata = - persistenceContext.getEntityById(DataMetadata.class, dataMetadataId); + Preconditions.checkNotNull( + dataMetadata, + "Could not find dataMetadata with id " + dataMetadataId); - Preconditions.checkNotNull( - dataMetadata, - "Could not find dataMetadata with id " + dataMetadataId); + CellType cellType = + persistenceContext.getEntityById(CellType.class, cellTypeId); - CellType cellType = - persistenceContext.getEntityById(CellType.class, cellTypeId); + Preconditions.checkNotNull( + cellType, + "Could not find cellType with id " + cellTypeId); - Preconditions.checkNotNull( - cellType, - "Could not find cellType with id " + cellTypeId); + Species species = + persistenceContext.getEntityOrNullById(Species.class, speciesId); - Species species = - persistenceContext.getEntityOrNullById(Species.class, speciesId); + Echotype echotype = + persistenceContext.getEntityOrNullById(Echotype.class, echotypeId); - Echotype echotype = - persistenceContext.getEntityOrNullById(Echotype.class, echotypeId); + List<Predicate<Category>> predicates = Lists.newArrayList(); + if (species != null) { + predicates.add(newSpeciesCategoryPredicate(species)); + } + if (echotype != null) { + predicates.add(newEchotypeCategoryPredicate(echotype)); + } - List<Predicate<Category>> predicates = Lists.newArrayList(); - if (species != null) { - predicates.add(newSpeciesCategoryPredicate(species)); - } - if (echotype != null) { - predicates.add(newEchotypeCategoryPredicate(echotype)); - } + Predicate<Category> acceptPredicate = Predicates.or(predicates); - Predicate<Category> acceptPredicate = Predicates.or(predicates); + result = getSpatialData(voyage, dataMetadata, cellType, acceptPredicate); - result = getSpatialData(voyage, dataMetadata, cellType, acceptPredicate); - -// cache.put(model, result); - } - return result; } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2013-11-04 07:52:33 UTC (rev 883) @@ -191,11 +191,6 @@ return result; } -// @Override -// public SpatialDataCache getSpatialDataCache() { -// return null; -// } - @Override public Locale getLocale() { return Locale.FRANCE; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2013-11-04 07:52:33 UTC (rev 883) @@ -27,13 +27,11 @@ import fr.ifremer.echobase.entities.DriverType; import fr.ifremer.echobase.persistence.EchoBaseEntityHelper; import fr.ifremer.echobase.persistence.JdbcConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.sql.SQLException; /** - * To create a fresh postgres database. + * To create a new fresh postgres database. * <p/> * Created on 11/3/13. * @@ -44,9 +42,6 @@ private static final long serialVersionUID = 1L; - /** Logger. */ - private static final Log log = LogFactory.getLog(CreatePostgresDb.class); - protected String login; protected String password; @@ -75,8 +70,6 @@ @Override public String execute() throws Exception { - String result = INPUT; - EchoBaseEntityHelper.checkJDBCConnection(metaJdbcConf); try { @@ -91,28 +84,20 @@ getEchoBaseSession().initWorkingDb(jdbcConf, true); addFlashMessage(_("echobase.info.workingDb.created", conf.getUrl())); - result = SUCCESS; } catch (Exception e) { -// if (log.isErrorEnabled()) { -// log.error("Could not create db", e); -// } try { //close working db if something is wrong. getEchoBaseSession().releaseWorkingDb(); } finally { metaJdbcConf = null; jdbcConf = null; -// addFieldError( -// "conf.url", -// _("echobase.error.workingDbConfiguration.couldNotCreate", -// e.getMessage())); } throw e; } - return result; + return SUCCESS; } @Override Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2013-11-04 07:52:33 UTC (rev 883) @@ -122,7 +122,6 @@ echobase.common.modificationUser=User echobase.common.moviesFile= echobase.common.name=Name -echobase.common.nbSpatialData=Number of result echobase.common.operationFile= echobase.common.operationMetadataFile= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements @@ -234,10 +233,8 @@ echobase.error.showData.voyage.required=Voyage required echobase.error.warlocation.notFound=Database .war file not found at location %s echobase.error.workingDbConfiguration.couldNotConnect=Could not connect to database (%s) -echobase.error.workingDbConfiguration.couldNotCreate=Could not create new postgres database echobase.error.workingDbConfiguration.createOnlyOnPostgresql=Database creation is only possible for *Postgresql* type echobase.error.workingDbConfiguration.description.required=Mandatory description -echobase.error.workingDbConfiguration.login.required=Mandatory login echobase.error.workingDbConfiguration.url.already.exists=A configuration with same url already exists echobase.error.workingDbConfiguration.url.required=Mandatory jdbc url echobase.header.request.result=SQL query result Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2013-11-04 07:52:33 UTC (rev 883) @@ -57,7 +57,6 @@ echobase.common.author=Auteur echobase.common.authorEmail=Courriel de l'auteur echobase.common.biometrySampleFile= -echobase.common.cellMapsFile= echobase.common.cellMapsFishFile=Fichier des cellules Cartes (Poisson) echobase.common.cellMapsOtherFile=Fichier des cellules Cartes (Autre) echobase.common.cellPositionReference=Référentiel géographique des cellules des cartes @@ -123,7 +122,6 @@ echobase.common.modificationUser=Utilisateur echobase.common.moviesFile= echobase.common.name=Nom -echobase.common.nbSpatialData=Nombre de cellules echobase.common.operationFile= echobase.common.operationMetadataFile= echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements @@ -235,10 +233,8 @@ echobase.error.showData.voyage.required=La sélection d'une campagne est obligatoire echobase.error.warlocation.notFound=L'application n'a pas été trouvée à l'emplacement suivant %s echobase.error.workingDbConfiguration.couldNotConnect=Impossible de se connecter (%s) -echobase.error.workingDbConfiguration.couldNotCreate=Impossible de créer la nouvelle base postgres echobase.error.workingDbConfiguration.createOnlyOnPostgresql=La création d'une base n'est possible que pour le type *Postgresql* echobase.error.workingDbConfiguration.description.required=Description obligatoire -echobase.error.workingDbConfiguration.login.required=Login obligatoire echobase.error.workingDbConfiguration.url.already.exists=Une configuration existe déjà avec cette url echobase.error.workingDbConfiguration.url.required=Url jdbc obligatoire echobase.header.request.result=Résultat de la requête SQL Modified: trunk/src/site/rst/db.rst =================================================================== --- trunk/src/site/rst/db.rst 2013-11-04 07:45:35 UTC (rev 882) +++ trunk/src/site/rst/db.rst 2013-11-04 07:52:33 UTC (rev 883) @@ -119,7 +119,6 @@ A noter que l'utilisateur pour se connecter à la base doit avoir des droits de création de base. - Spatialiser une base postgresql -------------------------------