April 2014 - Echobase-commits - mailman.cloud.codelutin.com

r1015 - trunk/echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 22 Apr '14

22 Apr '14

Author: tchemit Date: 2014-04-22 16:51:05 +0200 (Tue, 22 Apr 2014) New Revision: 1015 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1015 Log: clean config Modified: trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2014-04-22 14:50:28 UTC (rev 1014) +++ trunk/echobase-ui/src/main/resources/struts.xml 2014-04-22 14:51:05 UTC (rev 1015) @@ -108,6 +108,7 @@ <interceptor-stack name="echobaseBasicStack"> <interceptor-ref name="exception"/> <interceptor-ref name="servletConfig"/> + <interceptor-ref name="i18n"/> <interceptor-ref name="echobaseInjector"/> <interceptor-ref name="prepare"/> <interceptor-ref name="checkbox"/> @@ -148,53 +149,12 @@ <interceptor-ref name="debugging"/> </interceptor-stack> -  - </interceptors>  <default-class-ref class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"/> -  - </package> <package name="loggued" extends="default" abstract="true"> @@ -205,7 +165,6 @@ <interceptor-stack name="basicStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> -  <interceptor-ref name="echobaseBasicStack"/> </interceptor-stack> @@ -213,9 +172,7 @@ <interceptor-stack name="prepareParamsStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> -  <interceptor-ref name="echobaseDefaultStack"/> - </interceptor-stack>  @@ -223,7 +180,6 @@ <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> <interceptor-ref name="checkWorkingDbSelected"/> -  <interceptor-ref name="echobaseBasicStack"/> </interceptor-stack> @@ -232,7 +188,6 @@ <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> <interceptor-ref name="checkWorkingDbSelected"/> -  <interceptor-ref name="echobaseDefaultStack"/> </interceptor-stack>

1 0

r1014 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/service echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata
by tchemit＠users.forge.codelutin.com 22 Apr '14

22 Apr '14

Author: tchemit Date: 2014-04-22 16:50:28 +0200 (Tue, 22 Apr 2014) New Revision: 1014 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1014 Log: fixes #4984 Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -314,7 +314,7 @@ } protected <O> Decorator<O> getDecorator(Class<O> type) { - return decoratorService.getDecorator(getLocale(), type, null); + return decoratorService.getDecorator(type, null); } @@ -753,11 +753,11 @@ // replace by the decorate value if (sourceValue != null) { sourceValue = decoratorService.decorate( - l, sourceValue, null); + sourceValue, null); } if (targetValue != null) { targetValue = decoratorService.decorate( - l, targetValue, null); + targetValue, null); } } buffer.append("\n "); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DecoratorService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -96,7 +96,7 @@ import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n.t; +import static org.nuiton.i18n.I18n.l; /** * Service to decorate entities. @@ -114,11 +114,10 @@ decoratorProvider = new EchoBaseDecoratorProvider(); } - public <O> Decorator<O> getDecorator(Locale locale, - Class<O> type, + public <O> Decorator<O> getDecorator(Class<O> type, String context) { Preconditions.checkNotNull(type, "Decorator type can not be null!"); - Decorator<O> decorator = decoratorProvider.getDecoratorByType(locale, type, context); + Decorator<O> decorator = decoratorProvider.getDecoratorByType(getLocale(), type, context); Preconditions.checkNotNull( decorator, "Could not find decorator for type " + type + @@ -127,34 +126,34 @@ return decorator; } - public String decorate(Locale locale, Object o, String context) { - Decorator<?> decorator = getDecorator(locale, o.getClass(), context); + public String decorate(Object o, String context) { + Decorator<?> decorator = getDecorator(o.getClass(), context); String result = decorator.toString(o); return result; } public final <E extends Enum<E> & I18nAble> Map<String, String> decorateEnums(E... enumValues) { + Locale locale = getLocale(); Map<String, String> result = Maps.newLinkedHashMap(); for (E enumValue : enumValues) { - result.put(enumValue.name(), t(enumValue.getI18nKey())); + result.put(enumValue.name(), l(locale, enumValue.getI18nKey())); } return result; } - public <O> List<O> sortToList(Locale locale, Collection<O> beans, String context) { - Preconditions.checkNotNull(beans); - List<O> list = Lists.newArrayList(beans); - getDecoratorAndSort(locale, context, list); - return list; - } +// public <O> List<O> sortToList(Locale locale, Collection<O> beans, String context) { +// Preconditions.checkNotNull(beans); +// List<O> list = Lists.newArrayList(beans); +// getDecoratorAndSort(locale, context, list); +// return list; +// } - public <E extends TopiaEntity> Map<String, String> sortAndDecorate(Locale locale, - Collection<E> beans, + public <E extends TopiaEntity> Map<String, String> sortAndDecorate(Collection<E> beans, String context) { Preconditions.checkNotNull(beans); List<E> list = Lists.newArrayList(beans); - Decorator<E> decorator = getDecoratorAndSort(locale, context, list); + Decorator<E> decorator = getDecoratorAndSort(context, list); Map<String, String> result = Maps.newLinkedHashMap(); for (E bean : list) { result.put(bean.getTopiaId(), decorator.toString(bean)); @@ -168,19 +167,18 @@ E entity, String decoratorContext) { - String voyageToString = decorate(getLocale(), entity, decoratorContext); + String voyageToString = decorate(entity, decoratorContext); data.put(property + "_lbl", voyageToString); } - protected <O> Decorator<O> getDecoratorAndSort(Locale locale, - String context, + protected <O> Decorator<O> getDecoratorAndSort(String context, List<O> list) { Decorator<O> decorator = null; if (CollectionUtils.isNotEmpty(list)) { O object = list.get(0); Preconditions.checkNotNull(object); - decorator = decoratorProvider.getDecorator(locale, object, context); + decorator = decoratorProvider.getDecorator(getLocale(), object, context); Preconditions.checkNotNull( decorator, "Could not find decorator for type " + object.getClass() + Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -27,7 +27,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.entities.EntityModificationLog; @@ -738,7 +737,7 @@ public <E extends TopiaEntity> Map<String, String> loadSortAndDecorate(Class<E> beanType) { List<E> beans = persistenceContext.getDao(beanType).findAll(); - return decoratorService.sortAndDecorate(getLocale(), beans, null); + return decoratorService.sortAndDecorate(beans, null); } public <E extends TopiaEntity, K> Map<K, E> getEntitiesMap( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportdb/ExportService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -172,7 +172,7 @@ // export decorated foreign key value Decorator<TopiaEntity> decorator = - decoratorService.getDecorator(getLocale(), entityType, null); + decoratorService.getDecorator(entityType, null); model.addDecoratedForeignKeyForExport(propertyName, propertyName, decorator); } else { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportquery/ExportQueryService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -164,7 +164,7 @@ public <E extends TopiaEntity> Map<String, String> loadSortAndDecorate(Class<E> beanType) { List<E> beans = echoBaseInternalPersistenceContext.getDao(beanType).findAll(); - return decoratorService.sortAndDecorate(getLocale(), beans, null); + return decoratorService.sortAndDecorate(beans, null); } protected String getSafeSql(String sql) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -90,10 +90,10 @@ Map<String, String> result = Maps.newLinkedHashMap(); - Decorator<Transit> transitDecorator = decoratorService.getDecorator(getLocale(), Transit.class, null); - Decorator<Transect> transectDecorator = decoratorService.getDecorator(getLocale(), Transect.class, null); - Decorator<DataAcquisition> dataAcquisitionDecorator = decoratorService.getDecorator(getLocale(), DataAcquisition.class, null); - Decorator<DataProcessing> dataProcessingDecorator = decoratorService.getDecorator(getLocale(), DataProcessing.class, null); + Decorator<Transit> transitDecorator = decoratorService.getDecorator(Transit.class, null); + Decorator<Transect> transectDecorator = decoratorService.getDecorator(Transect.class, null); + Decorator<DataAcquisition> dataAcquisitionDecorator = decoratorService.getDecorator(DataAcquisition.class, null); + Decorator<DataProcessing> dataProcessingDecorator = decoratorService.getDecorator(DataProcessing.class, null); if (!voyage.isTransitEmpty()) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/strategy/FreeImportDbStrategy.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -70,7 +70,7 @@ Date date = newDate(); Decorator<Voyage> decorator = decoratorService.getDecorator( - getLocale(), Voyage.class, null); + Voyage.class, null); for (Voyage importedVoyage : importedVoyages) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/RemoveDataService.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -269,7 +269,7 @@ EchoBaseUser user) { Decorator<ImportLog> decorator = decoratorService. - getDecorator(getLocale(), ImportLog.class, null); + getDecorator(ImportLog.class, null); StringBuilder buffer = new StringBuilder(); buffer.append("Suppression import "); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/service/DecoratorServiceTest.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -29,7 +29,6 @@ import javax.inject.Inject; import java.util.List; -import java.util.Locale; /** * To test the {@link DecoratorService}. @@ -49,25 +48,23 @@ @Test public void getDecoratorForReferences() throws Exception { - Locale locale = serviceContext.getLocale(); List<EchoBaseUserEntityEnum> expectedTypes = serviceContext.getDbMeta().getReferenceTypes(); for (EchoBaseUserEntityEnum type : expectedTypes) { Decorator<?> decorator = - decoratorService.getDecorator(locale, type.getContract(), null); + decoratorService.getDecorator(type.getContract(), null); Assert.assertNotNull("Missing decorator for type : " + type, decorator); } } @Test public void getDecoratorForData() throws Exception { - Locale locale = serviceContext.getLocale(); List<EchoBaseUserEntityEnum> expectedTypes = serviceContext.getDbMeta().getDataTypes(); for (EchoBaseUserEntityEnum type : expectedTypes) { Decorator<?> decorator = - decoratorService.getDecorator(locale, type.getContract(), null); + decoratorService.getDecorator(type.getContract(), null); Assert.assertNotNull("Missing decorator for type : " + type, decorator); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -142,7 +142,7 @@ Decorator<ImportLog> importLogDecorator = decoratorService.getDecorator( - getLocale(), ImportLog.class, DecoratorService.DATE_ONLY); + ImportLog.class, DecoratorService.DATE_ONLY); Multimap<String, ImportLog> importLogsByVoyage = Multimaps.index( userDbPersistenceService.getImportLogs(), Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/Configure.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -160,7 +160,7 @@ Set<String> indicatorNames = coserApiService.getIndicators(); List<DataMetadata> dataMetadatas = userDbPersistenceService.getDataMetadatasInName(indicatorNames); - populationIndicators = decoratorService.sortAndDecorate(getLocale(), dataMetadatas, null); - communityIndicators = decoratorService.sortAndDecorate(getLocale(), dataMetadatas, null); + populationIndicators = decoratorService.sortAndDecorate(dataMetadatas, null); + communityIndicators = decoratorService.sortAndDecorate(dataMetadatas, null); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -71,9 +71,7 @@ if (!voyage.isTransitEmpty()) { Decorator<Vessel> decorator = - decoratorService.getDecorator(getLocale(), - Vessel.class, - null); + decoratorService.getDecorator(Vessel.class, null); Set<Vessel> allVessels = voyage.getAllVessels(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-04-22 14:19:05 UTC (rev 1013) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-04-22 14:50:28 UTC (rev 1014) @@ -78,7 +78,7 @@ importLogs = Lists.newArrayList(); - Decorator<Voyage> decorator = decoratorService.getDecorator(getLocale(), Voyage.class, null); + Decorator<Voyage> decorator = decoratorService.getDecorator(Voyage.class, null); for (String id : model.getImportLogIds()) { if (log.isInfoEnabled()) {

1 0

r1013 - trunk
by tchemit＠users.forge.codelutin.com 22 Apr '14

22 Apr '14

Author: tchemit Date: 2014-04-22 16:19:05 +0200 (Tue, 22 Apr 2014) New Revision: 1013 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1013 Log: updates mavenpom and topia Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-22 14:18:24 UTC (rev 1012) +++ trunk/pom.xml 2014-04-22 14:19:05 UTC (rev 1013) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.4</version> + <version>5.0.6</version> </parent> <groupId>fr.ifremer</groupId> @@ -138,7 +138,7 @@  - <topiaVersion>3.0-alpha-13</topiaVersion> + <topiaVersion>3.0-beta-2</topiaVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonWebVersion>1.16</nuitonWebVersion> @@ -257,7 +257,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>4.2.10.Final</version> + <version>4.3.5.Final</version> </dependency>

1 0

r1012 - trunk/echobase-domain/src/main/data
by tchemit＠users.forge.codelutin.com 22 Apr '14

22 Apr '14

Author: tchemit Date: 2014-04-22 16:18:24 +0200 (Tue, 22 Apr 2014) New Revision: 1012 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1012 Log: mise a jour du referentiel Modified: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase Modified: trunk/echobase-domain/src/main/data/echobase-referentiel.echobase =================================================================== (Binary files differ)

1 0

r1011 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase echobase-domain/src/main/java/fr/ifremer/echobase/entities/references echobase-services/src/main/java/fr/ifremer/echobase/services/service echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata
by tchemit＠users.forge.codelutin.com 22 Apr '14

22 Apr '14

Author: tchemit Date: 2014-04-22 16:15:39 +0200 (Tue, 22 Apr 2014) New Revision: 1011 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1011 Log: fixes Anomalie #4888: Pas possible d'importer une cellule de type r?\195?\169gion avec un cellType=='Region' (alors qu'il faudrait pouvoir le faire pour le grand polygone du survey) Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2014-04-17 09:38:52 UTC (rev 1010) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java 2014-04-22 14:15:39 UTC (rev 1011) @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.references.AcousticInstrument; import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.CellTypeImpl; import fr.ifremer.echobase.entities.references.SampleTypeImpl; import fr.ifremer.echobase.entities.references.SizeCategory; import org.apache.commons.collections4.CollectionUtils; @@ -58,41 +59,41 @@ } }; - public static final Predicate<CellType> IS_REGION_CELL_TYPE = new Predicate<CellType>() { + public static final Predicate<CellType> IS_ESDU_CELL_TYPE = new Predicate<CellType>() { - public final Set<String> acceptedNames = Sets.newHashSet( - "RegionCLAS", "RegionSURF" - ); - @Override public boolean apply(CellType input) { - boolean result = acceptedNames.contains(input.getId()); + boolean result = CellTypeImpl.ESDU.equals(input.getId().toLowerCase()); return result; } }; - public static final Predicate<CellType> IS_ESDU_CELL_TYPE = new Predicate<CellType>() { + public static final Predicate<CellType> IS_ELEMENTARY_CELL_TYPE = new Predicate<CellType>() { @Override public boolean apply(CellType input) { - boolean result = "esdu".equals(input.getId().toLowerCase()); + boolean result = CellTypeImpl.ELEMENTARY.equals(input.getId().toLowerCase()); return result; } }; - public static final Predicate<CellType> IS_ELEMENTARY_CELL_TYPE = new Predicate<CellType>() { + public static final Predicate<CellType> IS_MAP_CELL_TYPE = new Predicate<CellType>() { + public final Set<String> acceptedNames = Sets.newHashSet( + CellTypeImpl.MAP + ); + @Override public boolean apply(CellType input) { - boolean result = "elementary".equals(input.getId().toLowerCase()); + boolean result = acceptedNames.contains(input.getId()); return result; } }; - public static final Predicate<CellType> IS_MAP_CELL_TYPE = new Predicate<CellType>() { + public static final Predicate<CellType> IS_SHOAL_CELL_TYPE = new Predicate<CellType>() { public final Set<String> acceptedNames = Sets.newHashSet( - "Map" + CellTypeImpl.SHOAL ); @Override @@ -102,6 +103,12 @@ } }; + public static final Predicate<CellType> IS_REGION_CELL_TYPE = Predicates.not(Predicates.and( + IS_ESDU_CELL_TYPE, + IS_ELEMENTARY_CELL_TYPE, + IS_SHOAL_CELL_TYPE, + IS_MAP_CELL_TYPE)); + public static final Predicate<Cell> IS_REGION_CELL = new Predicate<Cell>() { @Override public boolean apply(Cell input) { Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java 2014-04-17 09:38:52 UTC (rev 1010) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypeImpl.java 2014-04-22 14:15:39 UTC (rev 1011) @@ -25,6 +25,8 @@ public static final String MAP = "Map"; + public static final String REGION = "Region"; + public static final String REGION_SURF = "RegionSURF"; public static final String REGION_CLAS = "RegionCLAS"; @@ -33,5 +35,7 @@ public static final String ESDU = "Esdu"; + public static final String SHOAL = "Shoal"; + private static final long serialVersionUID = 3631136258339910497L; } //CellTypeImpl Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-17 09:38:52 UTC (rev 1010) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java 2014-04-22 14:15:39 UTC (rev 1011) @@ -27,6 +27,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.entities.EntityModificationLog; @@ -225,6 +226,11 @@ //--- CellType -----------------------------------------------------------// //------------------------------------------------------------------------// + public List<CellType> getAllCellTypes() { + List<CellType> cellTypes = persistenceContext.getCellTypeDao().findAll(); + return cellTypes; + } + public CellType getCellType(String id) { CellType cellType = persistenceContext.getCellTypeDao().findByTopiaId(id); return cellType; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java 2014-04-17 09:38:52 UTC (rev 1010) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java 2014-04-22 14:15:39 UTC (rev 1011) @@ -50,8 +50,10 @@ import java.io.Reader; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; /** * To import regions results attached to a voyage. @@ -95,9 +97,13 @@ InputFile inputFile = configuration.getRegionsFile(); - CellType cellSurfaceType = persistenceService.getCellTypeById(CellTypeImpl.REGION_SURF); + Set<CellType> allCellTypes = new HashSet<CellType>(persistenceService.getAllCellTypes()); - CellType cellBottomType = persistenceService.getCellTypeById(CellTypeImpl.REGION_CLAS); + // remove some cell types (esdu, elementary, shoal) + allCellTypes.remove(persistenceService.getCellTypeById(CellTypeImpl.ELEMENTARY)); + allCellTypes.remove(persistenceService.getCellTypeById(CellTypeImpl.ESDU)); + allCellTypes.remove(persistenceService.getCellTypeById(CellTypeImpl.MAP)); + allCellTypes.remove(persistenceService.getCellTypeById(CellTypeImpl.SHOAL)); DataMetadata dataCoordinateMeta = persistenceService.getDataMetadataByName(DataMetadataImpl.REGION_ENV_COORDINATES); @@ -109,7 +115,7 @@ // authorize only to use region* cell types Map<String, CellType> cellTypeMap = Maps.uniqueIndex( - Arrays.asList(cellSurfaceType, cellBottomType), + allCellTypes, EchoBaseFunctions.CELL_TYPE_ID); RegionCellImportModel csvModel = new RegionCellImportModel(

1 0

r1010 - in trunk/echobase-domain/src/main/resources: . migration
by tchemit＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: tchemit Date: 2014-04-17 11:38:52 +0200 (Thu, 17 Apr 2014) New Revision: 1010 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1010 Log: fixes #4948 Modified: trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql trunk/echobase-domain/src/main/resources/postgis-structure.sql Modified: trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql 2014-04-17 09:20:20 UTC (rev 1009) +++ trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql 2014-04-17 09:38:52 UTC (rev 1010) @@ -224,9 +224,9 @@ ELSE -- update row RAISE DEBUG 'Will update spatial operation % ', operation_id; - UPDATE echobase_operation_spatial + UPDATE echobase_operation_spatial AS eos SET coordinate = coordinateData - WHERE operationid = operation_id; + WHERE eos.operationid = operation_id; END IF; END $$ LANGUAGE plpgsql; \ No newline at end of file Modified: trunk/echobase-domain/src/main/resources/postgis-structure.sql =================================================================== --- trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-04-17 09:20:20 UTC (rev 1009) +++ trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-04-17 09:38:52 UTC (rev 1010) @@ -1227,9 +1227,9 @@ ELSE -- update row RAISE DEBUG 'Will update spatial operation % ', operation_id; - UPDATE echobase_operation_spatial + UPDATE echobase_operation_spatial AS eos SET coordinate = coordinateData - WHERE operationid = operation_id; + WHERE eos.operationid = operation_id; END IF; END $$ LANGUAGE plpgsql;

1 0

r1009 - in trunk/echobase-domain/src/main: java/fr/ifremer/echobase/persistence/migration/workingDb resources resources/migration
by tchemit＠users.forge.codelutin.com 17 Apr '14

17 Apr '14

Author: tchemit Date: 2014-04-17 11:20:20 +0200 (Thu, 17 Apr 2014) New Revision: 1009 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1009 Log: fixes #4948 Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql trunk/echobase-domain/src/main/resources/postgis-structure.sql Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java 2014-04-17 08:11:08 UTC (rev 1008) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_6_1.java 2014-04-17 09:20:20 UTC (rev 1009) @@ -32,7 +32,7 @@ if (spatialAware) { - // fix add new postigs view (see https://forge.codelutin.com/issues/4194) + // fix add new postigs view (see https://forge.codelutin.com/issues/4947) updatePostgis(queries); } } Modified: trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql =================================================================== --- trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql 2014-04-17 08:11:08 UTC (rev 1008) +++ trunk/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql 2014-04-17 09:20:20 UTC (rev 1009) @@ -1,17 +1,76 @@ -CREATE OR REPLACE FUNCTION echobase_delete_cell() +-- +-- echobase_delete_voyage trigger +-- +DROP TRIGGER IF EXISTS echobase_delete_voyage ON voyage; + +CREATE OR REPLACE FUNCTION echobase_delete_voyage() RETURNS TRIGGER AS $$ BEGIN - RAISE DEBUG 'Delete cell % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + RAISE DEBUG 'Delete voyage % , delete cascade in echobase_cell_spatial_table, echobase_operation_spatial', OLD.topiaid; - DELETE FROM echobase_cell_spatial_temp WHERE cellid = OLD.topiaid; - DELETE FROM echobase_cell_spatial WHERE cellid = OLD.topiaid; + DELETE FROM echobase_cell_spatial WHERE voyageid = OLD.topiaid; + DELETE FROM echobase_operation_spatial WHERE voyageid = OLD.topiaid; RETURN OLD; END $$ LANGUAGE 'plpgsql'; +CREATE TRIGGER echobase_delete_voyage +BEFORE DELETE ON voyage +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_voyage(); + +-- +-- echobase_delete_transit trigger +-- +DROP TRIGGER IF EXISTS echobase_delete_transit ON transit; + +CREATE OR REPLACE FUNCTION echobase_delete_transit() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete transit % , delete cascade in echobase_cell_spatial_table, echobase_operation_spatial', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE transitid = OLD.topiaid; + DELETE FROM echobase_operation_spatial WHERE transitid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_transit +BEFORE DELETE ON transit +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_transit(); + +-- +-- echobase_delete_transect trigger +-- +DROP TRIGGER IF EXISTS echobase_delete_transect ON transect; + +CREATE OR REPLACE FUNCTION echobase_delete_transect() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete transect % , delete cascade in echobase_cell_spatial_table, echobase_operation_spatial', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE transectid = OLD.topiaid; + DELETE FROM echobase_operation_spatial WHERE transectid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_transect +BEFORE DELETE ON transect +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_transect(); + +-- +-- echobase_delete_operation trigger +-- +DROP TRIGGER IF EXISTS echobase_delete_operation ON operation; CREATE OR REPLACE FUNCTION echobase_delete_operation() RETURNS TRIGGER AS $$ BEGIN @@ -26,6 +85,77 @@ $$ LANGUAGE 'plpgsql'; +CREATE TRIGGER echobase_delete_operation +BEFORE DELETE ON operation +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_operation(); + +-- +-- echobase_delete_dataProcessing trigger +-- +DROP TRIGGER IF EXISTS echobase_delete_dataProcessing ON dataprocessing; + +CREATE OR REPLACE FUNCTION echobase_delete_dataProcessing() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete dataprocessing % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE dataprocessingid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_dataProcessing +BEFORE DELETE ON dataprocessing +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_dataProcessing(); + +-- +-- echobase_delete_dataAcquisition trigger +-- +DROP TRIGGER IF EXISTS echobase_delete_dataAcquisition ON dataAcquisition; + +CREATE OR REPLACE FUNCTION echobase_delete_dataAcquisition() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete dataAcquisition % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE dataacquisitionid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_dataAcquisition +BEFORE DELETE ON dataAcquisition +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_dataAcquisition(); + +-- +-- echobase_delete_cell trigger +-- +DROP TRIGGER IF EXISTS echobase_delete_cell ON cell; + +CREATE OR REPLACE FUNCTION echobase_delete_cell() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete cell % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + + DELETE FROM echobase_cell_spatial_temp WHERE cellid = OLD.topiaid; + DELETE FROM echobase_cell_spatial WHERE cellid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_cell +BEFORE DELETE ON cell +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_cell(); + CREATE OR REPLACE FUNCTION echobase_create_echobase_operation_spatial_row( operation_id VARCHAR, coordinateText VARCHAR) Modified: trunk/echobase-domain/src/main/resources/postgis-structure.sql =================================================================== --- trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-04-17 08:11:08 UTC (rev 1008) +++ trunk/echobase-domain/src/main/resources/postgis-structure.sql 2014-04-17 09:20:20 UTC (rev 1009) @@ -42,7 +42,17 @@ DROP TRIGGER IF EXISTS echobase_fill_cell_spatial_work_table_trigger ON data CASCADE; DROP FUNCTION IF EXISTS echobase_fill_spatial_temp_table() CASCADE; DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_temp_table() CASCADE; +DROP TRIGGER IF EXISTS echobase_delete_voyage ON cell CASCADE; +DROP TRIGGER IF EXISTS echobase_delete_transit ON cell CASCADE; +DROP TRIGGER IF EXISTS echobase_delete_transect ON cell CASCADE; +DROP TRIGGER IF EXISTS echobase_delete_dataAcquisition ON cell CASCADE; +DROP TRIGGER IF EXISTS echobase_delete_dataProcessing ON cell CASCADE; DROP TRIGGER IF EXISTS echobase_delete_cell ON cell CASCADE; +DROP FUNCTION IF EXISTS echobase_delete_voyage() CASCADE; +DROP FUNCTION IF EXISTS echobase_delete_transit() CASCADE; +DROP FUNCTION IF EXISTS echobase_delete_transect() CASCADE; +DROP FUNCTION IF EXISTS echobase_delete_dataAcquisition() CASCADE; +DROP FUNCTION IF EXISTS echobase_delete_dataProcessing() CASCADE; DROP FUNCTION IF EXISTS echobase_delete_cell() CASCADE; DROP FUNCTION IF EXISTS echobase_compute_all_cell_spatial_data() CASCADE; DROP FUNCTION IF EXISTS echobase_fill_cell_spatial_table() CASCADE; @@ -229,10 +239,117 @@ NULL) EXECUTE PROCEDURE echobase_fill_cell_spatial_temp_table(); -- --- Trigger qui met à jour la table des traitements spatiaux à faire lors d +-- Trigger qui met à jour la table des données spatiales lors d +-- 'une suppression de voyage +-- +CREATE OR REPLACE FUNCTION echobase_delete_voyage() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete voyage % , delete cascade in echobase_cell_spatial_table, echobase_operation_spatial', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE voyageid = OLD.topiaid; + DELETE FROM echobase_operation_spatial WHERE voyageid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_voyage +BEFORE DELETE ON voyage +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_voyage(); + +-- +-- Trigger qui met à jour la table des données spatiales lors d +-- 'une suppression de transit +-- +CREATE OR REPLACE FUNCTION echobase_delete_transit() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete transit % , delete cascade in echobase_cell_spatial_table, echobase_operation_spatial', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE transitid = OLD.topiaid; + DELETE FROM echobase_operation_spatial WHERE transitid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_transit +BEFORE DELETE ON transit +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_transit(); + +-- +-- Trigger qui met à jour la table des données spatiales lors d +-- 'une suppression de transect +-- +CREATE OR REPLACE FUNCTION echobase_delete_transect() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete transect % , delete cascade in echobase_cell_spatial_table, echobase_operation_spatial', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE transectid = OLD.topiaid; + DELETE FROM echobase_operation_spatial WHERE transectid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_transect +BEFORE DELETE ON transect +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_transect(); + +-- +-- Trigger qui met à jour la table des données spatiales lors d +-- 'une suppression de dataAcquisition +-- +CREATE OR REPLACE FUNCTION echobase_delete_dataProcessing() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete dataprocessing % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE dataprocessingid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_dataProcessing +BEFORE DELETE ON dataprocessing +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_dataProcessing(); + +-- +-- Trigger qui met à jour la table des données spatiales lors d +-- 'une suppression de dataProcessing +-- +CREATE OR REPLACE FUNCTION echobase_delete_dataAcquisition() + RETURNS TRIGGER AS $$ +BEGIN + + RAISE DEBUG 'Delete dataAcquisition % , delete cascade in echobase_cell_spatial_table', OLD.topiaid; + + DELETE FROM echobase_cell_spatial WHERE dataacquisitionid = OLD.topiaid; + + RETURN OLD; +END +$$ +LANGUAGE 'plpgsql'; + +CREATE TRIGGER echobase_delete_dataAcquisition +BEFORE DELETE ON dataAcquisition +FOR EACH ROW EXECUTE PROCEDURE echobase_delete_dataAcquisition(); + +-- +-- Trigger qui met à jour la table des données spatiales lors d -- 'une suppression de cellule -- - CREATE OR REPLACE FUNCTION echobase_delete_cell() RETURNS TRIGGER AS $$ BEGIN

1 0

Jenkins build is back to normal : echobase2 » EchoBase :: Domain #2
by admin+ci-codelutin.com＠codelutin.com 17 Apr '14

17 Apr '14

See <http://ci.codelutin.com/jenkins/job/echobase2/fr.ifremer.echobase$echobase-…>

1 0

Jenkins build is back to normal : echobase2 » EchoBase #2
by admin+ci-codelutin.com＠codelutin.com 17 Apr '14

17 Apr '14

See <http://ci.codelutin.com/jenkins/job/echobase2/fr.ifremer$echobase/2/>

1 0

Jenkins build is back to normal : echobase2 » EchoBase :: Services #2
by admin+ci-codelutin.com＠codelutin.com 17 Apr '14

17 Apr '14

See <http://ci.codelutin.com/jenkins/job/echobase2/fr.ifremer.echobase$echobase-…>

1 0