April 2021 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-9] 10 commits: Replace ShortIdDto by ToolkitDtoIdBean - Closes ultreiaio/ird-observe-toolkit#35
by Tony CHEMIT (＠tchemit) 30 Apr '21

30 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 31dbef0a by Tony Chemit at 2021-04-29T11:58:25+02:00 Replace ShortIdDto by ToolkitDtoIdBean - Closes ultreiaio/ird-observe-toolkit#35 - - - - - fb6b3a5d by Tony Chemit at 2021-04-29T21:58:30+02:00 Improve ToParentIdProvider and use generated getParentId sql query (moreover have it for any persisted data, not only for navigation data) - Closes #ultreiaio/ird-observe-toolkit#36 - - - - - 5266b6da by Tony Chemit at 2021-04-29T21:58:31+02:00 rename persistence test profile - - - - - abb1a837 by Tony Chemit at 2021-04-29T21:58:43+02:00 Improve how to load data to root in a navigation node (now get all the data then fill the parent userObject) - Closes #ultreiaio/ird-observe-toolkit#37 - - - - - 9f24a998 by Tony Chemit at 2021-04-29T22:14:56+02:00 update pom - - - - - 5037687b by Tony Chemit at 2021-04-30T12:16:49+02:00 fix fixture id - - - - - 0654a87f by Tony Chemit at 2021-04-30T12:17:13+02:00 add nice method to get dtoName from fixture constant - - - - - 308a28d0 by Tony Chemit at 2021-04-30T18:58:41+02:00 sanitize navigation API - Closes #ultreiaio/ird-observe-toolkit#38 - - - - - 5048d7b6 by Tony Chemit at 2021-04-30T19:11:52+02:00 Add more data in public API. Now we can deal with all types of data, even if they have no link with navigation tree. - - - - - b455c9ab by Tony Chemit at 2021-04-30T19:11:52+02:00 Improve how to load data to root in a navigation node (now get all the data then fill the parent userObject) - Closes #ultreiaio/ird-observe-toolkit#37 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModelStates.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/observation/LonglineElementAware.java - models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/observation/SectionWithTemplateDto.java - models/navigation/tree/src/test/java/fr/ird/observe/tree/TreeFixtures.java - models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/RootNavigationTreeNodeTest.java - models/navigation/tree/src/test/java/fr/ird/observe/tree/navigation/ToolkitTreeNodeBuilderTest.java - − models/navigation/tree/src/test/java/fr/ird/observe/tree/selection/DtoToTreeSelectionNodeClassMappingTest.java - models/navigation/tree/src/test/java/fr/ird/observe/tree/selection/RootSelectionTreeNodeTest.java - models/navigation/tree/src/test/java/fr/ird/observe/tree/selection/ToolkitTreeNodeBuilderTest.java - models/persistence/java/pom.xml - models/persistence/java/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - models/persistence/java/src/main/java/fr/ird/observe/entities/data/ProgramAwareTopiaDao.java - models/persistence/java/src/main/java/fr/ird/observe/entities/data/TripAwareTopiaDao.java - models/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripTopiaDao.java - models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripTopiaDao.java - models/persistence/java/src/main/java/fr/ird/observe/entities/tree/TreeBuilderSupport.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/tree/navigation/NavigationTreeBuilder.java - models/persistence/java/src/main/java/fr/ird/observe/entities/tree/NavigationTreeBuilder.java → models/persistence/java/src/main/java/fr/ird/observe/entities/tree/navigation/NodeContentBuilder.java - + models/persistence/java/src/main/java/fr/ird/observe/entities/tree/navigation/NodeDataBuilder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/51be9d72b1e433c08fc43e4c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/51be9d72b1e433c08fc43e4c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Generate name queries in entity mapping to use dto projection on hibernate -...
by Tony CHEMIT (＠tchemit) 28 Apr '21

28 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 51be9d72 by Tony Chemit at 2021-04-28T17:59:11+02:00 Generate name queries in entity mapping to use dto projection on hibernate - See ultreiaio/ird-observe-toolkit#34 - - - - - 3 changed files: - models/persistence/java/src/main/java/fr/ird/observe/entities/data/ProgramAwareTopiaDao.java - + models/persistence/java/src/test/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextTest.java - pom.xml Changes: ===================================== models/persistence/java/src/main/java/fr/ird/observe/entities/data/ProgramAwareTopiaDao.java ===================================== @@ -26,6 +26,7 @@ import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import fr.ird.observe.dto.ToolkitId; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.decoration.DecoratorServiceSupport; import fr.ird.observe.dto.reference.DataDtoReference; @@ -33,6 +34,7 @@ import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.common.GearType; import fr.ird.observe.dto.referential.common.ProgramDto; +import fr.ird.observe.entities.ObserveDaoQuerySupport; import fr.ird.observe.entities.ObserveEntityEnum; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.referential.common.Program; @@ -41,6 +43,8 @@ import fr.ird.observe.spi.context.DataDtoEntityContext; import org.apache.commons.lang3.NotImplementedException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hibernate.query.NativeQuery; +import org.hibernate.query.Query; import org.nuiton.topia.persistence.AddCriteriaOrRunQueryStepWithDelegate; import org.nuiton.topia.persistence.InnerAddCriteriaOrRunQueryStepWithDelegate; import org.nuiton.topia.persistence.TopiaDao; @@ -73,10 +77,11 @@ import java.util.stream.Stream; * @author Tony Chemit - dev(a)tchemit.fr * @since 9.0.0 */ +@SuppressWarnings("Guava") public abstract class ProgramAwareTopiaDao<D extends DataDto & fr.ird.observe.dto.data.ProgramAware, R extends DataDtoReference & fr.ird.observe.dto.data.ProgramAware, E extends DataEntity<D, R> & ProgramAware<D, R>, - P extends DataEntity<?, ?> & TripAware<?, ?>> implements TopiaDao<E> { + P extends DataEntity<?, ?> & TripAware<?, ?>> implements TopiaDao<E>, ObserveDaoQuerySupport { public static final String GET_CHILDREN = "SELECT" + " t.topiaId," + " t.lastUpdateDate," + @@ -451,4 +456,22 @@ public abstract class ProgramAwareTopiaDao<D extends DataDto & fr.ird.observe.dt protected TopiaQueryBuilderAddCriteriaOrRunQueryStep<Program> availableProgramStep(String id) { return availableProgramStep().addEquals(Program.PROPERTY_TOPIA_ID, id); } + + //FIXME We need to generate proper queries on program entity mapping + @Override + public final Query<ToolkitId> getIdQuery(String queryName) { + return delegate.getIdQuery(queryName); + } + + //FIXME We need to generate proper queries on program entity mapping + @Override + public final Query<Map<String, ?>> getMapQuery(String queryName) { + return delegate.getMapQuery(queryName); + } + + //FIXME We need to generate proper queries on program entity mapping + @Override + public <T> NativeQuery<T> getSqlQuery(String queryName) { + return delegate.getSqlQuery(queryName); + } } ===================================== models/persistence/java/src/test/java/fr/ird/observe/entities/ObserveTopiaPersistenceContextTest.java ===================================== @@ -0,0 +1,231 @@ +package fr.ird.observe.entities; + +/*- + * #%L + * ObServe Models :: Persistence :: Java + * %% + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.ToolkitId; +import fr.ird.observe.dto.ToolkitIdMap; +import fr.ird.observe.dto.data.EditableDto; +import fr.ird.observe.dto.data.OpenableDto; +import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.spi.PersistenceBusinessProject; +import fr.ird.observe.spi.context.DtoEntityContext; +import fr.ird.observe.spi.module.ObserveBusinessProject; +import fr.ird.observe.test.ObserveFixtures; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.lang.reflect.Modifier; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + +/** + * Created on 28/04/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +public class ObserveTopiaPersistenceContextTest extends PersistenceTestSupport { + + @Test + public void testMapProjection() { + try (ObserveTopiaPersistenceContext persistenceContext = localTestMethodResource.newPersistenceContext()) { + for (ObserveEntityEnum value : ObserveEntityEnum.values()) { + if (Modifier.isAbstract(value.getImplementation().getModifiers())) { + continue; + } + Class<? extends TopiaEntity> contract = value.getContract(); + List<String> allIds = persistenceContext.getDao(contract).findAllIds(); + if (allIds.isEmpty()) { + continue; + } + if (allIds.size() < 100) { + Stream<ToolkitIdMap> queryAll = persistenceContext.executeQueryMapAll(contract); + Assert.assertNotNull(queryAll); + Assert.assertEquals(allIds.size(), queryAll.count()); + } + + String id = allIds.get(0); + ToolkitIdMap queryOne = persistenceContext.executeQueryMapOne(contract, id); + Assert.assertNotNull(queryOne); + Assert.assertEquals(id, queryOne.getTopiaId()); + + Stream<ToolkitIdMap> querySome = persistenceContext.executeQueryMapSome(contract, Collections.singleton(id)); + Assert.assertNotNull(querySome); + Assert.assertEquals(1, querySome.count()); + + } + } + } + + @Test + public void testMapProjectionFromDao() { + try (ObserveTopiaPersistenceContext persistenceContext = localTestMethodResource.newPersistenceContext()) { + for (ObserveEntityEnum value : ObserveEntityEnum.values()) { + if (Modifier.isAbstract(value.getImplementation().getModifiers())) { + continue; + } + Class<? extends TopiaEntity> contract = value.getContract(); + ObserveDaoQuerySupport dao = (ObserveDaoQuerySupport) persistenceContext.getDao(contract); + List<String> allIds = dao.findAllIds(); + if (allIds.isEmpty()) { + continue; + } + if (allIds.size() < 100) { + Stream<ToolkitIdMap> queryAll = dao.executeQueryMapAll(); + Assert.assertNotNull(queryAll); + Assert.assertEquals(allIds.size(), queryAll.count()); + } + + String id = allIds.get(0); + ToolkitIdMap queryOne = dao.executeQueryMapOne(id); + Assert.assertNotNull(queryOne); + Assert.assertEquals(id, queryOne.getTopiaId()); + + Stream<ToolkitIdMap> querySome = dao.executeQueryMapSome(Collections.singleton(id)); + Assert.assertNotNull(querySome); + Assert.assertEquals(1, querySome.count()); + + } + } + } + + @Test + public void testGetParentId() { + + Set<Class<? extends OpenableDto>> openableDataTypes = ObserveBusinessProject.get().getOpenableDataTypes(); + Set<Class<? extends EditableDto>> editableDataTypes = ObserveBusinessProject.get().getEditableDataTypes(); + + try (ObserveTopiaPersistenceContext persistenceContext = localTestMethodResource.newPersistenceContext()) { + for (ObserveEntityEnum value : ObserveEntityEnum.values()) { + if (Modifier.isAbstract(value.getImplementation().getModifiers())) { + continue; + } + + @SuppressWarnings("unchecked") Class<? extends Entity> contract = (Class<? extends Entity>) value.getContract(); + DtoEntityContext<IdDto, DtoReference, ? extends Entity, ?> spi = PersistenceBusinessProject.fromEntity(contract); + if (spi == null) { + continue; + } + Class<IdDto> dtoType = spi.toDtoType(); + + boolean isOpen = openableDataTypes.contains(dtoType); + String id = null; + if (isOpen) { + List<String> allIds = persistenceContext.getDao(contract).findAllIds(); + if (allIds.isEmpty()) { + continue; + } + id = allIds.get(0); + } + if (id == null) { + continue; + } + String query = persistenceContext.executeQueryGetParentId(contract, id); + if (query == null) { + query = persistenceContext.executeQueryGetParentId2(contract, id); + Assert.assertNotNull(query); + } + } + } + } + + @Test + public void testIdProjection() { + try (ObserveTopiaPersistenceContext persistenceContext = localTestMethodResource.newPersistenceContext()) { + for (ObserveEntityEnum value : ObserveEntityEnum.values()) { + if (Modifier.isAbstract(value.getImplementation().getModifiers())) { + continue; + } + Class<? extends TopiaEntity> contract = value.getContract(); + List<String> allIds = persistenceContext.getDao(contract).findAllIds(); + if (allIds.isEmpty()) { + continue; + } + if (allIds.size() < 100) { + Stream<ToolkitId> queryAll = persistenceContext.executeQueryIdAll(contract); + Assert.assertNotNull(queryAll); + Assert.assertEquals(allIds.size(), queryAll.count()); + } + String id = allIds.get(0); + ToolkitId query = persistenceContext.executeQueryIdEquals(contract, id); + Assert.assertNotNull(query); + Assert.assertEquals(id, query.getTopiaId()); + Assert.assertEquals(id, query.getId()); + Assert.assertNotNull(query.getLastUpdateDate()); + + Stream<ToolkitId> querySome = persistenceContext.executeQueryIdIn(contract, Collections.singleton(id)); + Assert.assertNotNull(querySome); + Assert.assertEquals(1, querySome.count()); + + Stream<ToolkitId> queryBefore = persistenceContext.executeQueryIdBefore(contract, ObserveFixtures.DATE); + Assert.assertNotNull(queryBefore); + + Stream<ToolkitId> queryAfter = persistenceContext.executeQueryIdAfter(contract, ObserveFixtures.DATE); + Assert.assertNotNull(queryAfter); + } + } + } + + + @Test + public void testIdProjectionFromDao() { + try (ObserveTopiaPersistenceContext persistenceContext = localTestMethodResource.newPersistenceContext()) { + for (ObserveEntityEnum value : ObserveEntityEnum.values()) { + if (Modifier.isAbstract(value.getImplementation().getModifiers())) { + continue; + } + Class<? extends TopiaEntity> contract = value.getContract(); + ObserveDaoQuerySupport dao = (ObserveDaoQuerySupport) persistenceContext.getDao(contract); + List<String> allIds = dao.findAllIds(); + if (allIds.isEmpty()) { + continue; + } + if (allIds.size() < 100) { + Stream<ToolkitId> queryAll = dao.executeQueryIdAll(); + Assert.assertNotNull(queryAll); + Assert.assertEquals(allIds.size(), queryAll.count()); + } + String id = allIds.get(0); + ToolkitId query = dao.executeQueryIdEquals(id); + Assert.assertNotNull(query); + Assert.assertEquals(id, query.getTopiaId()); + Assert.assertEquals(id, query.getId()); + Assert.assertNotNull(query.getLastUpdateDate()); + + Stream<ToolkitId> querySome = dao.executeQueryIdIn(Collections.singleton(id)); + Assert.assertNotNull(querySome); + Assert.assertEquals(1, querySome.count()); + + Stream<ToolkitId> queryBefore = dao.executeQueryIdBefore(ObserveFixtures.DATE); + Assert.assertNotNull(queryBefore); + + Stream<ToolkitId> queryAfter = dao.executeQueryIdAfter(ObserveFixtures.DATE); + Assert.assertNotNull(queryAfter); + } + } + } +} ===================================== pom.xml ===================================== @@ -171,7 +171,7 @@ <lib.version.reflections>0.9.11</lib.version.reflections>  -  + <lib.version.java4all.topia>1.47-SNAPSHOT</lib.version.java4all.topia>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/51be9d72b1e433c08fc43e4c1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/51be9d72b1e433c08fc43e4c1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 8 commits: Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833
by Tony CHEMIT (＠tchemit) 27 Apr '21

27 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d057e402 by Tony Chemit at 2021-04-27T12:01:10+02:00 Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833 - - - - - 8877294a by Tony Chemit at 2021-04-27T12:01:10+02:00 toolkit snapshot - - - - - ee0f77e7 by Tony Chemit at 2021-04-27T12:01:10+02:00 update gitignore - - - - - d3cd7145 by Tony Chemit at 2021-04-27T12:01:10+02:00 Détection d'une base de version supérieure (always use application model to service configuration) - See #1831 - - - - - 45ff5747 by Tony Chemit at 2021-04-27T12:01:10+02:00 Détection d'une base de version supérieure (check the version in checkConnect service method) - See #1831 - - - - - 75595a50 by Tony Chemit at 2021-04-27T13:28:48+02:00 Réduire la taille de l'archive d'un retour d'expérience - Closes #1845 - - - - - 199456bb by Tony Chemit at 2021-04-27T14:16:01+02:00 Classement des connexion - Closes #1844 - - - - - c62aab7b by Tony Chemit at 2021-04-27T14:16:48+02:00 Landings : champ catégorie de poids doit être optionnel - Closes #1843 - - - - - 30 changed files: - .gitignore - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/core/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl - + client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl → client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl → client/core/src/main/i18n/templates/feedBackOnTechnicalError_en_GB.ftl - + client/core/src/main/i18n/templates/feedBackOnTechnicalError_es_ES.ftl - + client/core/src/main/i18n/templates/feedBackOnTechnicalError_fr_FR.ftl - + client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/core/src/main/java/fr/ird/observe/client/action/api/ActionStep.java - client/core/src/main/java/fr/ird/observe/client/action/api/ActionWithSteps.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/close/CloseLocalDataSourceFeedBackModel.java → client/core/src/main/java/fr/ird/observe/client/feedback/CloseLocalDataSourceFeedBackModel.java - client/core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java → client/core/src/main/java/fr/ird/observe/client/feedback/FeedBackBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenLocalDataSourceFeedBackModel.java → client/core/src/main/java/fr/ird/observe/client/feedback/OpenLocalDataSourceFeedBackModel.java - + client/core/src/main/java/fr/ird/observe/client/feedback/TechnicalErrorFeedBackBuilderModel.java - client/core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client/core/src/main/java/fr/ird/observe/client/util/ObserveSwingTechnicalException.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/config/actions/ServerConfigToggleConfigurations.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcb71b1dca791e66425db30a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcb71b1dca791e66425db30a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Classement des connexion - Closes #1844
by Tony CHEMIT (＠tchemit) 27 Apr '21

27 Apr '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d54e10cd by Tony Chemit at 2021-04-27T14:15:13+02:00 Classement des connexion - Closes #1844 - - - - - 2 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/config/actions/ServerConfigToggleConfigurations.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -674,6 +674,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig public void addRemoteDataSourceConfiguration(RemoteDataSourceConfiguration configuration) { List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(RemoteDataSourceConfiguration::getName)); setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[0])); saveForUser(); } @@ -682,6 +683,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig List<RemoteDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getRemoteDataSourceConfigurations())); remoteDataSourceConfigurations.remove(configuration); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(RemoteDataSourceConfiguration::getName)); setRemoteDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new RemoteDataSourceConfiguration[0])); saveForUser(); } @@ -727,6 +729,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig public void addServerDataSourceConfiguration(ServerDataSourceConfiguration configuration) { List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(ServerDataSourceConfiguration::getName)); setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[0])); saveForUser(); } @@ -735,6 +738,7 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig List<ServerDataSourceConfiguration> remoteDataSourceConfigurations = new ArrayList<>(Arrays.asList(getServerDataSourceConfigurations())); remoteDataSourceConfigurations.remove(configuration); remoteDataSourceConfigurations.add(configuration); + remoteDataSourceConfigurations.sort(Comparator.comparing(ServerDataSourceConfiguration::getName)); setServerDataSourceConfigurations(remoteDataSourceConfigurations.toArray(new ServerDataSourceConfiguration[0])); saveForUser(); } ===================================== client/datasource/api/src/main/java/fr/ird/observe/client/datasource/api/config/actions/ServerConfigToggleConfigurations.java ===================================== @@ -51,7 +51,7 @@ public class ServerConfigToggleConfigurations extends ToggleConfigurationsSuppor protected void preparePopup(JPopupMenu menu) { int position = 0; menu.removeAll(); - for (ServerDataSourceConfiguration configuration : getClientConfig().getServerDataSourceConfigurations()) { + for (ServerDataSourceConfiguration configuration : getClientConfig().getServerDataSourceConfigurationList()) { addConfiguration(ui, configuration, position++); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d54e10cdc68b7cfbbe83f7d1d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d54e10cdc68b7cfbbe83f7d1d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Réduire la taille de l'archive d'un retour d'expérience - Closes #1845
by Tony CHEMIT (＠tchemit) 27 Apr '21

27 Apr '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 292934b2 by Tony Chemit at 2021-04-27T12:58:52+02:00 Réduire la taille de l'archive d'un retour d'expérience - Closes #1845 - - - - - 1 changed file: - client/core/src/main/java/fr/ird/observe/client/feedback/FeedBackBuilder.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/feedback/FeedBackBuilder.java ===================================== @@ -188,7 +188,7 @@ public class FeedBackBuilder { } private void copyDirectoryToZip(Path rootFile, ZipOutputStream zipOutputStream) throws IOException { - copyDirectoryToZip(rootFile, t -> true, zipOutputStream); + copyDirectoryToZip(rootFile, t -> !t.getParent().getParent().toFile().getName().equals("shapeFiles"), zipOutputStream); } private void copyDirectoryToZip(Path rootFile, Predicate<Path> predicate, ZipOutputStream zipOutputStream) throws IOException { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/292934b21db7c70a9ea39038a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/292934b21db7c70a9ea39038a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833
by Tony CHEMIT (＠tchemit) 27 Apr '21

27 Apr '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 49933442 by Tony Chemit at 2021-04-27T12:08:57+02:00 Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833 - - - - - ebcd39cd by Tony Chemit at 2021-04-27T12:08:57+02:00 Détection d'une base de version supérieure (always use application model to service configuration) - See #1831 - - - - - 24fd9c45 by Tony Chemit at 2021-04-27T12:08:57+02:00 update gitignore - - - - - 30 changed files: - .gitignore - client/core/pom.xml - client/core/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl - + client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl → client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl → client/core/src/main/i18n/templates/feedBackOnTechnicalError_en_GB.ftl - + client/core/src/main/i18n/templates/feedBackOnTechnicalError_es_ES.ftl - + client/core/src/main/i18n/templates/feedBackOnTechnicalError_fr_FR.ftl - + client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/core/src/main/java/fr/ird/observe/client/action/api/ActionStep.java - client/core/src/main/java/fr/ird/observe/client/action/api/ActionWithSteps.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/close/CloseLocalDataSourceFeedBackModel.java → client/core/src/main/java/fr/ird/observe/client/feedback/CloseLocalDataSourceFeedBackModel.java - client/core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java → client/core/src/main/java/fr/ird/observe/client/feedback/FeedBackBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenLocalDataSourceFeedBackModel.java → client/core/src/main/java/fr/ird/observe/client/feedback/OpenLocalDataSourceFeedBackModel.java - + client/core/src/main/java/fr/ird/observe/client/feedback/TechnicalErrorFeedBackBuilderModel.java - client/core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client/core/src/main/java/fr/ird/observe/client/util/ObserveSwingTechnicalException.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/253bc50767e2391eee9bc2f0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/253bc50767e2391eee9bc2f0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 5 commits: Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833
by Tony CHEMIT (＠tchemit) 26 Apr '21

26 Apr '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: a9f33f6c by Tony Chemit at 2021-04-26T20:30:30+02:00 Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833 - - - - - 521d2b4d by Tony Chemit at 2021-04-26T20:30:30+02:00 toolkit snapshot - - - - - d000f4f0 by Tony Chemit at 2021-04-26T20:30:30+02:00 update gitignore - - - - - 17383853 by Tony Chemit at 2021-04-26T20:30:30+02:00 Détection d'une base de version supérieure (always use application model to service configuration) - See #1831 - - - - - fcb71b1d by Tony Chemit at 2021-04-26T20:30:30+02:00 Détection d'une base de version supérieure (check the version in checkConnect service method) - See #1831 - - - - - 30 changed files: - .gitignore - client/core/pom.xml - client/core/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/feedBackOnClosingLocalDataSource_fr_FR.ftl - + client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl → client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_fr_FR.ftl - client/datasource/editor/api/src/main/i18n/templates/feedBackOnOpeningLocalDataSource_en_GB.ftl → client/core/src/main/i18n/templates/feedBackOnTechnicalError_en_GB.ftl - + client/core/src/main/i18n/templates/feedBackOnTechnicalError_es_ES.ftl - + client/core/src/main/i18n/templates/feedBackOnTechnicalError_fr_FR.ftl - + client/core/src/main/java/fr/ird/observe/client/ErrorHandler.java - client/core/src/main/java/fr/ird/observe/client/action/api/ActionStep.java - client/core/src/main/java/fr/ird/observe/client/action/api/ActionWithSteps.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/close/CloseLocalDataSourceFeedBackModel.java → client/core/src/main/java/fr/ird/observe/client/feedback/CloseLocalDataSourceFeedBackModel.java - client/core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java → client/core/src/main/java/fr/ird/observe/client/feedback/FeedBackBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/loading/open/OpenLocalDataSourceFeedBackModel.java → client/core/src/main/java/fr/ird/observe/client/feedback/OpenLocalDataSourceFeedBackModel.java - + client/core/src/main/java/fr/ird/observe/client/feedback/TechnicalErrorFeedBackBuilderModel.java - client/core/src/main/java/fr/ird/observe/client/main/actions/GotoSiteAction.java - client/core/src/main/java/fr/ird/observe/client/util/ObserveSwingTechnicalException.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteExecutor.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6758472ea42b1afb0380d6b5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6758472ea42b1afb0380d6b5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Détection d'une base de version supérieure (always use application model to...
by Tony CHEMIT (＠tchemit) 26 Apr '21

26 Apr '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d18c3fd by Tony Chemit at 2021-04-26T15:37:12+02:00 Détection d'une base de version supérieure (always use application model to service configuration) - See #1831 - - - - - 253bc507 by Tony Chemit at 2021-04-26T15:37:12+02:00 update gitignore - - - - - 2 changed files: - .gitignore - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java Changes: ===================================== .gitignore ===================================== @@ -8,6 +8,10 @@ /*/*/*/*/target/ /*.iml /*/*.iml +/*/*/*.iml +/*/*/*/*.iml +/*/*/*/*/*.iml +/*/*/*/*/*/*.iml /*.ipr /*/*.ipr /*.iws ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java ===================================== @@ -328,7 +328,8 @@ public class DataSourceHelper { h2Config.getPassword(), h2Config.isShowMigrationProgression(), h2Config.isShowMigrationSql(), - h2Config.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -343,7 +344,8 @@ public class DataSourceHelper { pgConfig.isUseSsl(), pgConfig.isShowMigrationProgression(), pgConfig.isShowMigrationSql(), - pgConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -356,7 +358,8 @@ public class DataSourceHelper { restConfig.getLogin(), restConfig.getPassword(), restConfig.getOptionalDatabaseName().orElse(null), - restConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c200daeca1160f544599b2cf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c200daeca1160f544599b2cf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833
by Tony CHEMIT (＠tchemit) 26 Apr '21

26 Apr '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 95e86b66 by Tony Chemit at 2021-04-26T14:47:17+02:00 Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833 - - - - - c200daec by Tony Chemit at 2021-04-26T14:48:23+02:00 Détection d'une base de version supérieure - Closes #1831 - - - - - 2 changed files: - client/core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java ===================================== @@ -116,7 +116,8 @@ public class FeedBackBuilder { case JOptionPane.CLOSED_OPTION: case 1: // cancel operation - throw new IllegalStateException("User cancel operation"); + log.warn("User cancel feed back creation."); + return; } File feedBackFile = model.getFeedBackFile(); log.info(String.format("Create feed back at: %s", feedBackFile)); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java ===================================== @@ -328,7 +328,8 @@ public class DataSourceHelper { h2Config.getPassword(), h2Config.isShowMigrationProgression(), h2Config.isShowMigrationSql(), - h2Config.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -343,7 +344,8 @@ public class DataSourceHelper { pgConfig.isUseSsl(), pgConfig.isShowMigrationProgression(), pgConfig.isShowMigrationSql(), - pgConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -356,7 +358,8 @@ public class DataSourceHelper { restConfig.getLogin(), restConfig.getPassword(), restConfig.getOptionalDatabaseName().orElse(null), - restConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/627b236393c0536b1f719c4d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/627b236393c0536b1f719c4d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-3
by Tony CHEMIT (＠tchemit) 26 Apr '21

26 Apr '21

Tony CHEMIT deleted branch release/9.0.0-RC-3 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0