Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
dab9fdc8
by Tony Chemit at 2020-08-05T13:26:18+02:00
-
4f50f240
by Tony Chemit at 2020-08-05T13:26:19+02:00
-
e154abdc
by Tony Chemit at 2020-08-05T13:26:19+02:00
-
ca258626
by Tony Chemit at 2020-08-05T13:31:08+02:00
3 changed files:
- client-configuration/src/main/config/Client.ini
- client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java
Changes:
| ... | ... | @@ -597,7 +597,7 @@ defaultValue = true |
| 597 | 597 |
description = observe.config.ui.seineBycatchObservedSystem.description
|
| 598 | 598 |
key = ui.seineBycatchObservedSystem
|
| 599 | 599 |
type = fr.ird.observe.validation.SeineBycatchObservedSystemConfig
|
| 600 |
-defaultValue = {\"fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936\": [\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1\"]}
|
|
| 600 |
+defaultValue = {\"fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936\": [\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1\",\"fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908\"]}
|
|
| 601 | 601 |
|
| 602 | 602 |
[option temporaryFilesTimeout]
|
| 603 | 603 |
description = observe.config.temporaryFilesTimeout.description
|
| ... | ... | @@ -47,10 +47,11 @@ public class ClientConfigTest { |
| 47 | 47 |
{
|
| 48 | 48 |
Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystem.getRequiredObservedSystemBySpeciesId("fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936");
|
| 49 | 49 |
Assert.assertNotNull(requiredObservedSystemBySpeciesId);
|
| 50 |
- Assert.assertEquals(2, requiredObservedSystemBySpeciesId.size());
|
|
| 50 |
+ Assert.assertEquals(3, requiredObservedSystemBySpeciesId.size());
|
|
| 51 | 51 |
Iterator<String> iterator = requiredObservedSystemBySpeciesId.iterator();
|
| 52 | 52 |
Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.0", iterator.next());
|
| 53 | 53 |
Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.1", iterator.next());
|
| 54 |
+ Assert.assertEquals("fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908", iterator.next());
|
|
| 54 | 55 |
}
|
| 55 | 56 |
{
|
| 56 | 57 |
Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystem.getRequiredObservedSystemBySpeciesId("fr.ird.observe.entities.referentiel.Species#1239832684290#0.04680507324710936_fake");
|
| ... | ... | @@ -721,8 +721,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U |
| 721 | 721 |
|
| 722 | 722 |
log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size()));
|
| 723 | 723 |
// by default always remove obsolete references
|
| 724 |
- List<R> referentialReferences = DtoReferenceCollection.filterEnabled(incomingReferences);
|
|
| 725 |
- log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size()));
|
|
| 724 |
+ boolean validationDisabledReferential = ui.getConfig().isValidationDisabledReferential();
|
|
| 725 |
+ List<R> referentialReferences = validationDisabledReferential ? new LinkedList<>(incomingReferences) : DtoReferenceCollection.filterEnabled(incomingReferences);
|
|
| 726 |
+ log.debug(String.format("Filter referential references (type %s - property %s), without disabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size()));
|
|
| 726 | 727 |
|
| 727 | 728 |
//noinspection unchecked
|
| 728 | 729 |
ReferentialReferencesFilter<D, R> referentialReferencesFilter = referentialsFilters.get(propertyName);
|