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

[Git][ultreiaio/ird-observe][develop] Review storage configuration and improve it.
by Tony CHEMIT 25 Feb '21

25 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9cd900ba by Tony Chemit at 2021-02-25T19:41:00+01:00 Review storage configuration and improve it. Still need to finish the templates refactor (nearly done). - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/i18n/getters/java.getter - client/core/src/main/i18n/getters/jaxx.getter - + client/core/src/main/i18n/templates/connexion-test-remote_en_GB.ftl - + client/core/src/main/i18n/templates/connexion-test-remote_es_ES.ftl - + client/core/src/main/i18n/templates/connexion-test-remote_fr_FR.ftl - + client/core/src/main/i18n/templates/connexion-test-server_en_GB.ftl - + client/core/src/main/i18n/templates/connexion-test-server_es_ES.ftl - + client/core/src/main/i18n/templates/connexion-test-server_fr_FR.ftl - + client/core/src/main/i18n/templates/dataSource_en_GB.ftl - + client/core/src/main/i18n/templates/dataSource_es_ES.ftl - + client/core/src/main/i18n/templates/dataSource_fr_FR.ftl - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/ConfigSupport.jaxx - + client/core/src/main/java/fr/ird/observe/client/datasource/config/ConfigSupport.jcss - + client/core/src/main/java/fr/ird/observe/client/datasource/config/ConfigSupportModel.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/RemoteConfig.jaxx - + client/core/src/main/java/fr/ird/observe/client/datasource/config/RemoteConfig.jcss - + client/core/src/main/java/fr/ird/observe/client/datasource/config/RemoteConfigHandler.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/RemoteConfigModel.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/ServerConfig.jaxx - + client/core/src/main/java/fr/ird/observe/client/datasource/config/ServerConfig.jcss - + client/core/src/main/java/fr/ird/observe/client/datasource/config/ServerConfigHandler.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/ServerConfigModel.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/ConfigSupportAction.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/PresetMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/actions/ConfigUISaveRemoteConfigurationAction.java → client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/RemoteConfigSaveConfiguration.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/RemoteConfigToggleConfigurations.java - + client/core/src/main/java/fr/ird/observe/client/datasource/config/actions/RemoteConfigUseConfiguration.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9cd900ba0112e50a2294cf4df… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9cd900ba0112e50a2294cf4df… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Little improvements on editor APi (use a little more ShortIdDto in it).
by Tony CHEMIT 23 Feb '21

23 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d305908b by Tony Chemit at 2021-02-23T09:35:46+01:00 Little improvements on editor APi (use a little more ShortIdDto in it). - - - - - 14 changed files: - 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 - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModelStates.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/list/GenerateContentListUIModelStates.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModelStates.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIModelHelper.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/SaveRequest.java ===================================== @@ -23,8 +23,10 @@ package fr.ird.observe.client.datasource.editor.api.content.actions.save; */ import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.ShortIdDto; import java.util.Objects; +import java.util.Optional; import java.util.function.Predicate; import java.util.function.Supplier; @@ -36,21 +38,19 @@ import java.util.function.Supplier; */ public class SaveRequest { - private final Class<? extends IdDto> parentType; - private final String parentId; + private final ShortIdDto parent; private final String id; private final Supplier<? extends IdDto> beanSupplier; private final boolean notPersisted; private final Predicate<String> predicate; private IdDto bean; - public SaveRequest(Class<? extends IdDto> parentType, String parentId, String id, Supplier<? extends IdDto> beanSupplier) { - this(parentType, parentId, id, beanSupplier, t -> true); + public SaveRequest(ShortIdDto parentId, String id, Supplier<? extends IdDto> beanSupplier) { + this(parentId, id, beanSupplier, t -> true); } - public SaveRequest(Class<? extends IdDto> parentType, String parentId, String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) { - this.parentType = Objects.requireNonNull(parentType); - this.parentId = Objects.requireNonNull(parentId); + public SaveRequest(ShortIdDto parentId, String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) { + this.parent = Objects.requireNonNull(parentId); this.id = id; this.notPersisted = id == null; this.beanSupplier = Objects.requireNonNull(beanSupplier); @@ -58,20 +58,15 @@ public class SaveRequest { } public SaveRequest(String id, Supplier<? extends IdDto> beanSupplier, Predicate<String> predicate) { - this.parentType = null; - this.parentId = null; + this.parent = null; this.id = id; this.notPersisted = id == null; this.beanSupplier = Objects.requireNonNull(beanSupplier); this.predicate = predicate; } - public Class<? extends IdDto> getParentType() { - return parentType; - } - public String getParentId() { - return parentId; + return Optional.ofNullable(parent).map(ShortIdDto::getId).orElse(null); } public String getId() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java ===================================== @@ -24,8 +24,11 @@ package fr.ird.observe.client.datasource.editor.api.content.data.edit; import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelStatesSupport; import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelSupport; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.data.EditableDto; +import java.util.Objects; + /** * Created on 30/10/2020. * @@ -36,15 +39,19 @@ public class ContentEditUIModelStates<D extends EditableDto> extends ContentSimp /** * Parent Data id. */ - private final String selectedParentId; + private final ShortIdDto selectedParent; - public ContentEditUIModelStates(ContentSimpleUIModelSupport<D> model, D bean, String selectedId, String selectedParentId) { + public ContentEditUIModelStates(ContentSimpleUIModelSupport<D> model, D bean, String selectedId, ShortIdDto selectedParent) { super(model, bean, selectedId); - this.selectedParentId = selectedParentId; + this.selectedParent = Objects.requireNonNull(selectedParent); + } + + public final ShortIdDto selectedParent() { + return selectedParent; } public final String getSelectedParentId() { - return selectedParentId; + return selectedParent().getId(); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationInitializer.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.edit; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; @@ -78,6 +79,10 @@ public class ContentEditUINavigationInitializer extends NavigationInitializer<Co return parentReference; } + public ShortIdDto getParentShortReference() { + return parentReference.toShortReference(); + } + public DataDtoReference getReference() { return reference; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java ===================================== @@ -28,6 +28,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentMode; import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel; import fr.ird.observe.client.datasource.editor.api.content.ContentUIModelStates; import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import org.apache.commons.collections4.CollectionUtils; @@ -53,16 +54,16 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten public static final String PROPERTY_LAYOUT_NAME = "layoutName"; private static final Logger log = LogManager.getLogger(ContentListUIModelStates.class); private final ReferencesCache referenceCache; - private final String selectedParentId; + private final ShortIdDto selectedParent; private final String editNodeId; private final boolean parentOpen; private List<R> data; private List<R> selectedDatas; private String layoutName; - public ContentListUIModelStates(ContentListUIModel<R> model, String selectedParentId, String editNodeId, boolean parentOpen) { + public ContentListUIModelStates(ContentListUIModel<R> model, ShortIdDto selectedParent, String editNodeId, boolean parentOpen) { this.referenceCache = Objects.requireNonNull(model).getSource().getContext().newReferenceCache(); - this.selectedParentId = selectedParentId; + this.selectedParent = selectedParent; this.editNodeId = editNodeId; this.parentOpen = parentOpen; } @@ -88,8 +89,7 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten } }); - String selectedId = getSelectedParentId(); - log.info(source.getInitializer().getLogPrefix() + "parentSelectedId = " + selectedId); + log.info(String.format("%s parentSelectedId = %s", source.getInitializer().getLogPrefix(), selectedParent())); @SuppressWarnings("unchecked") List<R> data = (List<R>) source.getReferences(); setData(data); } @@ -102,8 +102,12 @@ public class ContentListUIModelStates<R extends DataDtoReference> extends Conten return editNodeId; } + public ShortIdDto selectedParent() { + return selectedParent; + } + public String getSelectedParentId() { - return selectedParentId; + return selectedParent().getId(); } public List<R> getData() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.list; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.LazyDataDtoReferenceSet; @@ -84,6 +85,10 @@ public class ContentListUINavigationInitializer extends NavigationInitializer<Co return parentReference; } + public ShortIdDto getParentShortReference() { + return parentReference.toShortReference(); + } + public final String getSelectedParentId() { return getParentReference().getId(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentUIModel; import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelStatesSupport; import fr.ird.observe.client.datasource.validation.ClientValidationContext; import fr.ird.observe.client.datasource.validation.ClientValidationContextApplicationComponent; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.data.OpenableDto; import fr.ird.observe.dto.data.ps.common.TripDto; import org.apache.logging.log4j.LogManager; @@ -43,20 +44,24 @@ public class ContentOpenableUIModelStates<D extends OpenableDto> extends Content /** * Parent Data id. */ - private final String selectedParentId; + private final ShortIdDto selectedParent; /** * Historical data (found on trip data). */ private boolean historicalData; - public ContentOpenableUIModelStates(ContentOpenableUIModel<D> model, D bean, String selectedId, String selectedParentId) { + public ContentOpenableUIModelStates(ContentOpenableUIModel<D> model, D bean, String selectedId, ShortIdDto selectedParent) { super(model, bean, selectedId); - this.selectedParentId = selectedParentId; + this.selectedParent = selectedParent; + } + + public ShortIdDto selectedParent() { + return selectedParent; } public final String getSelectedParentId() { - return selectedParentId; + return selectedParent().getId(); } // @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.open; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationContext; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationInitializer; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationScope; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import io.ultreia.java4all.bean.definition.JavaBeanPropertyDefinition; @@ -90,6 +91,10 @@ public final class ContentOpenableUINavigationInitializer extends NavigationInit return parentReference; } + public ShortIdDto getParentShortReference() { + return parentReference.toShortReference(); + } + public final DataDtoReference getReference() { return reference; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUIModelStates.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; */ import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveRequest; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.data.ll.logbook.SetDto; import fr.ird.observe.dto.data.ll.logbook.SetStubDto; import fr.ird.observe.dto.form.Form; @@ -63,12 +64,12 @@ public class SetUIModelStates extends GeneratedSetUIModelStates { firePropertyChange("copySetCandidate", oldValue, copySetCandidate); } - public String getSetIdToCopy() { - return copySetCandidate == null ? null : copySetCandidate.getId(); + public SaveRequest toSaveRequestWithCopy() { + return new SaveRequest(setIdToCopy(), getSelectedId(), this::getBeanToSave); } - public SaveRequest toSaveRequestWithCopy() { - return new SaveRequest(SetDto.class, getSetIdToCopy(), getSelectedId(), this::getBeanToSave); + private ShortIdDto setIdToCopy() { + return copySetCandidate == null ? null : copySetCandidate.toShortReference(); } private void updateCopySetCandidate(Date newValue) { ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModel.java ===================================== @@ -37,13 +37,12 @@ public class GenerateContentEditUIModel extends GenerateContentEditUISupport { public static final String TO_SAVE_REQUEST = "" + " @Override\n" + " public SaveRequest toSaveRequest() {\n" + - " return new SaveRequest(%1$s.class, getStates().getSelectedParentId(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" + + " return new SaveRequest(getStates().selectedParent(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" + " }\n\n"; @Override protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) { - String save = String.format(TO_SAVE_REQUEST, scopeBuilder.parentDtoReferenceType.getName()); - return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), save); + return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), TO_SAVE_REQUEST); } @Override ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUIModelStates.java ===================================== @@ -37,7 +37,7 @@ import java.util.List; public class GenerateContentEditUIModelStates extends GenerateContentEditUISupport { private static final String GENERATED_CONSTRUCTOR = "" + " public Generated%1$sUIModelStates(Generated%1$sUIModel model) {\n" + - " super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getSelectedParentId());\n" + + " super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getParentShortReference());\n" + " }\n\n"; private static final String CONSTRUCTOR = "" + " public %1$sUIModelStates(Generated%1$sUIModel model) {\n" + ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/list/GenerateContentListUIModelStates.java ===================================== @@ -37,7 +37,7 @@ import java.util.List; public class GenerateContentListUIModelStates extends GenerateContentListUISupport { private static final String GENERATED_CONSTRUCTOR = "" + " public Generated%1$sModelStates(Generated%1$sModel model) {\n" + - " super(model, model.getSource().getInitializer().getSelectedParentId(), model.getSource().getInitializer().getEditNodeId(), model.getSource().getInitializer().isOpen());\n" + + " super(model, model.getSource().getInitializer().getParentShortReference(), model.getSource().getInitializer().getEditNodeId(), model.getSource().getInitializer().isOpen());\n" + " }\n\n"; private static final String CONSTRUCTOR = "" + " public %1$sModelStates(Generated%1$sModel model) {\n" + ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModel.java ===================================== @@ -37,13 +37,12 @@ public class GenerateContentOpenableUIModel extends GenerateContentOpenableUISup public static final String TO_SAVE_REQUEST = "" + " @Override\n" + " public SaveRequest toSaveRequest() {\n" + - " return new SaveRequest(%1$s.class, getStates().getSelectedParentId(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" + + " return new SaveRequest(getStates().selectedParent(), getStates().getSelectedId(), getStates()::getBeanToSave);\n" + " }\n\n"; @Override protected String generateAbstractContent0(Path sourceDirectory, Path targetDirectory, Path path, String packageName, String namePrefix) { - String save = String.format(TO_SAVE_REQUEST, scopeBuilder.parentDtoReferenceType.getName()); - return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), save); + return uiModelHelper.generateModelGeneratedContent(dtoType, referenceType, ContentUIModelHelper.generateStates(cleanClassName), TO_SAVE_REQUEST); } @Override ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUIModelStates.java ===================================== @@ -37,7 +37,7 @@ import java.util.List; public class GenerateContentOpenableUIModelStates extends GenerateContentOpenableUISupport { private static final String GENERATED_CONSTRUCTOR = "" + " public Generated%1$sUIModelStates(Generated%1$sUIModel model) {\n" + - " super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getSelectedParentId());\n" + + " super(model, %1$sDto.newDto(new java.util.Date()), model.getSource().getInitializer().getSelectId(), model.getSource().getInitializer().getParentShortReference());\n" + " }\n\n"; private static final String CONSTRUCTOR = "" + " public %1$sUIModelStates(Generated%1$sUIModel model) {\n" + ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIModelHelper.java ===================================== @@ -120,14 +120,14 @@ public class ContentUIModelHelper extends ContentUIHelperSupport { " @Override\n" + " public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" + " return MoveRequestBuilder\n" + - " .create(%1$s.class, getSource().getParentReference().toShortReference(), toReference(getStates().getBean()))\n" + + " .create(%1$s.class, getStates().selectedParent(), toReference(getStates().getBean()))\n" + " .setEditNode(getSource().getInitializer().getEditNode());\n" + " }\n\n"; public static final String TO_MOVE_REQUEST_MULTIPLE = "" + " @Override\n" + " public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" + " return MoveRequestBuilder\n" + - " .create(%1$s.class, getSource().getParentReference().toShortReference(), getStates().getSelectedDatas())\n" + + " .create(%1$s.class, getStates().selectedParent(), getStates().getSelectedDatas())\n" + " .setEditNode(getSource().getInitializer().getEditNode());\n" + " }\n\n"; public static final String CREATE_FORM = "" + View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d305908bbab6c3356580228aa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d305908bbab6c3356580228aa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: fixup! build ci on features
by Tony CHEMIT 22 Feb '21

22 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 45db1344 by Tony Chemit at 2021-02-22T20:14:50+01:00 fixup! build ci on features - - - - - 1e7bb086 by Tony Chemit at 2021-02-22T21:24:18+01:00 Rendre les déplacements impossible si les parents incriminés sont obsolètes. - Closes #1794 - - - - - 6 changed files: - .gitlab-ci.yml - 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/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUIModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIModelHelper.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java Changes: ===================================== .gitlab-ci.yml ===================================== @@ -101,7 +101,7 @@ trigger-make-stage: .automatic: &automatic only: - /^develop.*$/i - - /^features/.+$/i + - /^feature/.+$/i except: - triggers @@ -155,7 +155,7 @@ release-deploy-demo: .manual: &manual only: - /^develop.*$/i - - /^features/.+$/i + - /^feature/.+$/i when: manual create-docker: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequest.java ===================================== @@ -35,20 +35,13 @@ import java.util.StringJoiner; * @author Tony Chemit - dev(a)tchemit.fr * @since 8.0.1 */ +@SuppressWarnings("unchecked") public class MoveRequest { /** * Reference type of data to move. */ private final Class<? extends DataDtoReference> referenceType; - /** - * Reference type of parent data to move. - */ - private final Class<? extends DtoReference> parentReferenceType; - /** - * Reference type of parent target. - */ - private final Class<? extends DtoReference> parentTargetReferenceType; /** * Id of parent data to move. */ @@ -66,13 +59,11 @@ public class MoveRequest { */ private final boolean selectTarget; - public MoveRequest(Class<? extends DataDtoReference> referenceType, Class<? extends DtoReference> parentReferenceType, Class<? extends DtoReference> parentTargetReferenceType, String oldParentId, ImmutableSet<String> ids, String newParentId, boolean selectTarget) { + public MoveRequest(Class<? extends DataDtoReference> referenceType, ShortIdDto oldParentId, ImmutableSet<String> ids, ShortIdDto newParentId, boolean selectTarget) { this.referenceType = referenceType; - this.parentReferenceType = parentReferenceType; - this.parentTargetReferenceType = parentTargetReferenceType; - this.oldParentId = ShortIdDto.of(parentReferenceType, oldParentId); + this.oldParentId = oldParentId; this.ids = ids; - this.newParentId = ShortIdDto.of(parentTargetReferenceType, newParentId); + this.newParentId = newParentId; this.selectTarget = selectTarget; } @@ -81,11 +72,11 @@ public class MoveRequest { } public Class<? extends DtoReference> getParentReferenceType() { - return parentReferenceType; + return (Class<? extends DtoReference>) oldParentId.getType(); } public Class<? extends DtoReference> getParentTargetReferenceType() { - return parentTargetReferenceType; + return (Class<? extends DtoReference>) newParentId.getType(); } public ShortIdDto getOldParentId() { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.mode.ChangeMo import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUII18nHelper; import fr.ird.observe.client.datasource.editor.api.content.referential.usage.UsageUIHandlerSupport; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.ShortIdDto; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.DtoReferenceCollection; @@ -85,14 +86,10 @@ public class MoveRequestBuilder { * Reference type of data to move. */ private final Class<? extends DataDtoReference> referenceType; - /** - * Reference type of parent data to move. - */ - private final Class<? extends DtoReference> parentReferenceType; /** * Id of parent data to move. */ - private final String oldParentId; + private final ShortIdDto oldParentId; /** * Data to delete. */ @@ -181,18 +178,17 @@ public class MoveRequestBuilder { } } - public static StepSetParentCandidates create(Class<? extends DataDtoReference> referenceType, Class<? extends DtoReference> parentReferenceType, String oldParentId, DtoReference id) { - return create(referenceType, parentReferenceType, oldParentId, ImmutableSet.of(id)); + public static StepSetParentCandidates create(Class<? extends DataDtoReference> referenceType, ShortIdDto oldParentId, DtoReference id) { + return create(referenceType, oldParentId, ImmutableSet.of(id)); } - public static StepSetParentCandidates create(Class<? extends DataDtoReference> referenceType, Class<? extends DtoReference> parentReferenceType, String oldParentId, Collection<? extends DtoReference> data) { - MoveRequestBuilder builder = new MoveRequestBuilder(referenceType, parentReferenceType, oldParentId, data); + public static StepSetParentCandidates create(Class<? extends DataDtoReference> referenceType, ShortIdDto oldParentId, Collection<? extends DtoReference> data) { + MoveRequestBuilder builder = new MoveRequestBuilder(referenceType, oldParentId, data); return new BuilderImpl(builder); } - private MoveRequestBuilder(Class<? extends DataDtoReference> referenceType, Class<? extends DtoReference> parentReferenceType, String oldParentId, Collection<? extends DtoReference> data) { + private MoveRequestBuilder(Class<? extends DataDtoReference> referenceType, ShortIdDto oldParentId, Collection<? extends DtoReference> data) { this.referenceType = Objects.requireNonNull(referenceType); - this.parentReferenceType = Objects.requireNonNull(parentReferenceType); this.oldParentId = Objects.requireNonNull(oldParentId); this.data = Objects.requireNonNull(data); KeyStroke keyStroke = ObserveKeyStrokesEditorApi.KEY_STROKE_SELECT_TARGET; @@ -247,9 +243,10 @@ public class MoveRequestBuilder { return this; } + @SuppressWarnings("unchecked") public Optional<MoveRequest> build(DataSourceEditor dataSourceEditor) { if (parentTargetReferenceType == null) { - parentTargetReferenceType = parentReferenceType; + parentTargetReferenceType = (Class<? extends DtoReference>) oldParentId.getType(); } if (askNewParentTitle == null) { askNewParentTitle = ContentOpenableUII18nHelper.getActionMoveChooseParentTitle(referenceType); @@ -258,7 +255,7 @@ public class MoveRequestBuilder { askNewParentMessage = ContentOpenableUII18nHelper.getActionMoveChooseParentMessage(referenceType); } - DtoReferenceCollection<?> parentCandidates = Objects.requireNonNull(this.parentCandidates, "No parent candidates set.").apply(oldParentId); + DtoReferenceCollection<?> parentCandidates = Objects.requireNonNull(this.parentCandidates, "No parent candidates set.").apply(oldParentId.getId()); String newParentId = askNewParent(parentCandidates.toList(), askNewParentTitle, askNewParentMessage).orElse(null); if (newParentId == null) { return Optional.empty(); @@ -275,7 +272,7 @@ public class MoveRequestBuilder { } } } - return Optional.of(new MoveRequest(referenceType, parentReferenceType, parentTargetReferenceType, oldParentId, ids, newParentId, selectTarget.isSelected())); + return Optional.of(new MoveRequest(referenceType, oldParentId, ids, ShortIdDto.of(parentTargetReferenceType, newParentId), selectTarget.isSelected())); } private <R extends DtoReference> Optional<String> askNewParent(List<R> parentCandidates, String dialogTitle, String dialogMessage) { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivitySampleUIModel.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; import fr.ird.observe.client.datasource.editor.api.content.actions.move.MoveRequestBuilder; -import fr.ird.observe.dto.data.ll.logbook.ActivityReference; import fr.ird.observe.dto.data.ll.logbook.ActivitySampleReference; public class ActivitySampleUIModel extends GeneratedActivitySampleUIModel { @@ -34,6 +33,6 @@ public class ActivitySampleUIModel extends GeneratedActivitySampleUIModel { } public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() { - return MoveRequestBuilder.create(ActivitySampleReference.class, ActivityReference.class, getStates().getSelectedParentId(), toReference(getStates().getBean())); + return MoveRequestBuilder.create(ActivitySampleReference.class, getSource().getParentReference().toShortReference(), toReference(getStates().getBean())); } } ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUIModelHelper.java ===================================== @@ -120,14 +120,14 @@ public class ContentUIModelHelper extends ContentUIHelperSupport { " @Override\n" + " public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" + " return MoveRequestBuilder\n" + - " .create(%1$s.class, %2$s.class, getStates().getSelectedParentId(), toReference(getStates().getBean()))\n" + + " .create(%1$s.class, getSource().getParentReference().toShortReference(), toReference(getStates().getBean()))\n" + " .setEditNode(getSource().getInitializer().getEditNode());\n" + " }\n\n"; public static final String TO_MOVE_REQUEST_MULTIPLE = "" + " @Override\n" + " public MoveRequestBuilder.StepSetParentCandidates toMoveRequest() {\n" + " return MoveRequestBuilder\n" + - " .create(%1$s.class, %2$s.class, getStates().getSelectedParentId(), getStates().getSelectedDatas())\n" + + " .create(%1$s.class, getSource().getParentReference().toShortReference(), getStates().getSelectedDatas())\n" + " .setEditNode(getSource().getInitializer().getEditNode());\n" + " }\n\n"; public static final String CREATE_FORM = "" + @@ -193,14 +193,14 @@ public class ContentUIModelHelper extends ContentUIHelperSupport { extraMethods += String.format(TO_DELETE_REQUEST_MULTIPLE, referenceType.getSimpleName()); imports.add(MoveRequestBuilder.class.getName()); imports.add(generator.scopeBuilder.parentDtoReferenceType.getName()); - extraMethods += String.format(TO_MOVE_REQUEST_MULTIPLE, referenceType.getSimpleName(), generator.scopeBuilder.parentDtoReferenceType.getSimpleName()); + extraMethods += String.format(TO_MOVE_REQUEST_MULTIPLE, referenceType.getSimpleName()); } else if (uiModel == ContentEditUIModel.class) { extraMethods += String.format(TO_DELETE_REQUEST, referenceType.getSimpleName()); } else if (uiModel == ContentOpenableUIModel.class) { imports.add(MoveRequestBuilder.class.getName()); extraMethods += String.format(TO_DELETE_REQUEST_WITH_EDIT, referenceType.getSimpleName()); imports.add(generator.scopeBuilder.parentDtoReferenceType.getName()); - extraMethods += String.format(TO_MOVE_REQUEST, referenceType.getSimpleName(), generator.scopeBuilder.parentDtoReferenceType.getSimpleName()); + extraMethods += String.format(TO_MOVE_REQUEST, referenceType.getSimpleName()); } } return generate(UI_MODEL_GENERATED, imports, generator.cleanClassName, uiModel, generics, extraMethods); ===================================== services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java ===================================== @@ -87,6 +87,38 @@ public class OpenableDataServiceFixtures { ShortIdDto oldParentId = getIdReference(fixtures, "move.oldParentId"); ShortIdDto newParentId = getIdReference(fixtures, "move.newParentId"); service.move(oldParentId, newParentId, ImmutableSet.of(id)); + + // move back to original + service.move(newParentId, oldParentId, ImmutableSet.of(id)); + + {// try to move them back using bad timestamp (will fail) + ShortIdDto oldParentId2 = oldParentId.of(new Date(0)); + try { + service.move(oldParentId2, newParentId, ImmutableSet.of(id)); + Assert.fail(String.format("Should got a concurrent modification on move %s", id)); + } catch (ConcurrentModificationException e) { + Assert.assertTrue(true); + } + } + {// try to move them back using bad timestamp (will fail) + ShortIdDto newParentId2 = newParentId.of(new Date(0)); + try { + service.move(oldParentId, newParentId2, ImmutableSet.of(id)); + Assert.fail(String.format("Should got a concurrent modification on move %s", id)); + } catch (ConcurrentModificationException e) { + Assert.assertTrue(true); + } + } + {// try to move them back using bad timestamp (will fail) + ShortIdDto oldParentId2 = oldParentId.of(new Date(0)); + ShortIdDto newParentId2 = newParentId.of(new Date(0)); + try { + service.move(oldParentId2, newParentId2, ImmutableSet.of(id)); + Assert.fail(String.format("Should got a concurrent modification on move %s", id)); + } catch (ConcurrentModificationException e) { + Assert.assertTrue(true); + } + } } public static ShortIdDto getIdReference(ObserveServiceFixtures<?> fixtures, String property) { @@ -97,7 +129,7 @@ public class OpenableDataServiceFixtures { return ObserveBusinessProject.get().toShortDto(id); } else { type = Objects2.forName(id.substring(0, index)); - id = id.substring(index+1); + id = id.substring(index + 1); return ShortIdDto.of(type, id); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/35cca7670d8ae0b8d0c24c6e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/35cca7670d8ae0b8d0c24c6e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/migration_catches] build ci on features
by Tony CHEMIT 22 Feb '21

22 Feb '21

Tony CHEMIT pushed to branch feature/migration_catches at ultreiaio / ird-observe Commits: 3db474be by Tony Chemit at 2021-02-22T19:35:47+01:00 build ci on features - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -101,7 +101,7 @@ trigger-make-stage: .automatic: &automatic only: - /^develop.*$/i - - /^features/.+$/i + - /^feature/.+$/i except: - triggers @@ -155,7 +155,7 @@ release-deploy-demo: .manual: &manual only: - /^develop.*$/i - - /^features/.+$/i + - /^feature/.+$/i when: manual create-docker: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3db474beb87dd0da16b551c24… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3db474beb87dd0da16b551c24… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/migration_catches] 5 commits: build ci on features
by Tony CHEMIT 22 Feb '21

22 Feb '21

Tony CHEMIT pushed to branch feature/migration_catches at ultreiaio / ird-observe Commits: 35cca767 by Tony Chemit at 2021-02-22T19:29:19+01:00 build ci on features - - - - - 9d998535 by Tony Chemit at 2021-02-22T19:34:29+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 6ee6af07 by Tony Chemit at 2021-02-22T19:34:36+01:00 stash - - - - - ddde304b by Tony Chemit at 2021-02-22T19:34:36+01:00 stash persistence tests - - - - - b5fa30c0 by Tony Chemit at 2021-02-22T19:34:36+01:00 stash services tests - - - - - 30 changed files: - .gitlab-ci.yml - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - + client/datasource/.mvn/pom.organizationId - + client/datasource/.mvn/pom.projectId - + client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop - + client/datasource/editor/.mvn/pom.gitflow.master - + client/datasource/editor/.mvn/pom.organizationId - + client/datasource/editor/.mvn/pom.projectId - + client/datasource/editor/.mvn/pom.stageId - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api-test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/41f3f7a7f1b1dfcf9b9f885a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/41f3f7a7f1b1dfcf9b9f885a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] build ci on features
by Tony CHEMIT 22 Feb '21

22 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 35cca767 by Tony Chemit at 2021-02-22T19:29:19+01:00 build ci on features - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -101,6 +101,7 @@ trigger-make-stage: .automatic: &automatic only: - /^develop.*$/i + - /^features/.+$/i except: - triggers @@ -154,6 +155,7 @@ release-deploy-demo: .manual: &manual only: - /^develop.*$/i + - /^features/.+$/i when: manual create-docker: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/35cca7670d8ae0b8d0c24c6ee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/35cca7670d8ae0b8d0c24c6ee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/migration_catches
by Tony CHEMIT 22 Feb '21

22 Feb '21

Tony CHEMIT pushed new branch feature/migration_catches at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/migration_catches You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 2 commits: Mauvaise génération d'une sauvegarde si toutes les données sont sélectionnées
by Tony CHEMIT 22 Feb '21

22 Feb '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 84fe6699 by Tony Chemit at 2021-02-22T17:04:52+01:00 Mauvaise génération d'une sauvegarde si toutes les données sont sélectionnées - - - - - d1b78ece by Tony Chemit at 2021-02-22T18:11:45+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - + client/datasource/.mvn/pom.organizationId - + client/datasource/.mvn/pom.projectId - + client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop - + client/datasource/editor/.mvn/pom.gitflow.master - + client/datasource/editor/.mvn/pom.organizationId - + client/datasource/editor/.mvn/pom.projectId - + client/datasource/editor/.mvn/pom.stageId - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/.mvn/pom.gitflow.develop - client/datasource/editor/api/.mvn/pom.gitflow.master - client/datasource/editor/api/pom.xml - client/datasource/editor/common/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2cd7e8c9d4091cef272c0721… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2cd7e8c9d4091cef272c0721… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mauvaise génération d'une sauvegarde si toutes les données sont sélectionnées
by Tony CHEMIT 22 Feb '21

22 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 84fe6699 by Tony Chemit at 2021-02-22T17:04:52+01:00 Mauvaise génération d'une sauvegarde si toutes les données sont sélectionnées - - - - - 30 changed files: - client/runner/src/test/java/fr/ird/observe/client/ObserveTextGeneratorTest.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/ObservePersistenceFixtures.java - models/persistence/java/src/test/java/fr/ird/observe/entities/PersistenceTestSupport.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/spi/AssociationsTest.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/spi/DeleteTest.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/spi/EntitySqlDescriptorTest.java - + models/persistence/java/src/test/java/fr/ird/observe/entities/spi/PersistenceModelTest.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/spi/ReplicateTest.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/spi/ReplicationOrderBuilderTest.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/spi/TablesTest.java - − models/persistence/java/src/test/java/fr/ird/observe/entities/spi/TopiaMetadataModelPathsTest.java - − models/persistence/java/src/test/resources/fixtures/persistence/count-referential-common.properties - − models/persistence/java/src/test/resources/fixtures/persistence/count-referential-seine.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-associations-count-data-ll.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-associations-count-data-ps.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-associations-count-referential.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-paths-count.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-paths-links-count.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-tables-count-data-ll.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-tables-count-data-ps.properties - − models/persistence/java/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - models/persistence/java/src/test/resources/fixtures/persistence/entity-replication-order-trip-longline.list → models/persistence/java/src/test/resources/fixtures/persistence/replication_order/data-ll.list - models/persistence/java/src/test/resources/fixtures/persistence/entity-replication-order-trip-seine.list → models/persistence/java/src/test/resources/fixtures/persistence/replication_order/data-ps.list - models/persistence/java/src/test/resources/fixtures/persistence/entity-replication-order-referential.list → models/persistence/java/src/test/resources/fixtures/persistence/replication_order/referential.list - models/persistence/java/src/test/resources/fixtures/persistence/entity-associations-selector-data-ll.properties → models/persistence/java/src/test/resources/fixtures/persistence/selector_count/association/data-ll.properties - models/persistence/java/src/test/resources/fixtures/persistence/entity-associations-selector-data-ps.properties → models/persistence/java/src/test/resources/fixtures/persistence/selector_count/association/data-ps.properties - models/persistence/java/src/test/resources/fixtures/persistence/entity-associations-selector-referential.properties → models/persistence/java/src/test/resources/fixtures/persistence/selector_count/association/referential.properties - models/persistence/java/src/test/resources/fixtures/persistence/entity-tables-selector-data-ll.properties → models/persistence/java/src/test/resources/fixtures/persistence/selector_count/table/data-ll.properties - models/persistence/java/src/test/resources/fixtures/persistence/entity-tables-selector-data-ps.properties → models/persistence/java/src/test/resources/fixtures/persistence/selector_count/table/data-ps.properties - models/persistence/java/src/test/resources/fixtures/persistence/entity-tables-selector-referential.properties → models/persistence/java/src/test/resources/fixtures/persistence/selector_count/table/referential.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/84fe669984ee11242b7916127… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/84fe669984ee11242b7916127… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Move to 9.0.0-RC-1 and go to 9 baseline
by Tony CHEMIT 20 Feb '21

20 Feb '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 2cd7e8c9 by Tony Chemit at 2021-02-20T10:14:17+01:00 Move to 9.0.0-RC-1 and go to 9 baseline - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/configuration/.mvn/pom.gitflow.develop - client/configuration/.mvn/pom.gitflow.master - client/configuration/pom.xml - client/core/.mvn/pom.gitflow.develop - client/core/.mvn/pom.gitflow.master - client/core/pom.xml - + client/datasource/.mvn/pom.gitflow.develop - + client/datasource/.mvn/pom.gitflow.master - + client/datasource/.mvn/pom.organizationId - + client/datasource/.mvn/pom.projectId - + client/datasource/.mvn/pom.stageId - client/datasource/actions/.mvn/pom.gitflow.develop - client/datasource/actions/.mvn/pom.gitflow.master - client/datasource/actions/pom.xml - + client/datasource/editor/.mvn/pom.gitflow.develop - + client/datasource/editor/.mvn/pom.gitflow.master - + client/datasource/editor/.mvn/pom.organizationId - + client/datasource/editor/.mvn/pom.projectId - + client/datasource/editor/.mvn/pom.stageId - client/datasource/editor/api-test/.mvn/pom.gitflow.develop - client/datasource/editor/api-test/.mvn/pom.gitflow.master - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/.mvn/pom.gitflow.develop - client/datasource/editor/api/.mvn/pom.gitflow.master - client/datasource/editor/api/pom.xml - client/datasource/editor/common/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2cd7e8c9d4091cef272c07212… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2cd7e8c9d4091cef272c07212… You're receiving this email because of your account on gitlab.com.

1 0