Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2477c752 by Tony Chemit at 2022-06-12T10:35:24+02:00 Exception sur consultation des UI referentiel - Closes #2398 - - - - - ba3e239b by Tony Chemit at 2022-06-12T10:54:46+02:00 update pom - - - - - 5 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationContext.java - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUINavigationInitializer.java ===================================== @@ -67,7 +67,6 @@ public class ContentRootListUINavigationInitializer extends NavigationInitialize @Override protected Object init(NavigationContext<ContentRootListUINavigationContext> context) { decorator = context.getDecoratorService().getDecoratorByType(getScope().getMainReferenceType(), getScope().getDecoratorClassifier()); -// context.initReference(parentReference); return getParentReference(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/ContentRootOpenableUINavigationInitializer.java ===================================== @@ -56,7 +56,6 @@ public final class ContentRootOpenableUINavigationInitializer extends Navigation @Override protected DataDtoReference init(NavigationContext<ContentRootOpenableUINavigationContext> context) { -// context.initReference(parentReference.get()); decorator = context.getDecoratorService().getDecoratorByType(reference.getReferenceType(), getScope().getDecoratorClassifier()); reference.registerDecorator(decorator); return getReference(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUINavigationInitializer.java ===================================== @@ -50,8 +50,7 @@ public class ContentReferentialUINavigationInitializer extends NavigationInitial @Override protected Object init(NavigationContext<ContentReferentialUINavigationContext> context) { - decorator = context.getDecoratorService().getDecoratorByType(references.getType(), getScope().getDecoratorClassifier()); - context.initReference(references, decorator); + decorator = context.getDecoratorService().getDecoratorByType(getScope().getMainReferenceType(), getScope().getDecoratorClassifier()); return getScope().getMainType(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationContext.java ===================================== @@ -29,7 +29,6 @@ import fr.ird.observe.dto.data.DataGroupByDto; import fr.ird.observe.dto.data.RootOpenableDto; import fr.ird.observe.dto.reference.DataGroupByDtoSet; import fr.ird.observe.dto.reference.DtoReference; -import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialLocale; @@ -113,19 +112,11 @@ public class NavigationContext<C extends NavigationContext<C>> implements WithCl public final <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> getReferentialReferenceSet(Class<R> referenceType, Decorator decorator) { ReferentialDtoReferenceSet<R> reference = getMainDataSource().getReferentialService().getReferenceSet(referenceType, null); - initReference(reference, decorator); + reference.stream().forEach(e -> e.registerDecorator(decorator)); log.info(String.format("Loaded %d reference(s) of type: %s", reference.size(), reference.getType().getName())); return reference; } - public final <R extends DtoReference> void initReference(DtoReferenceCollection<R> reference, Decorator decorator) { - if (reference == null) { - return; - } - reference.stream().forEach(e -> e.registerDecorator(decorator)); - log.info(String.format("Init %d reference(s) of type: %s", reference.size(), reference.getType().getName())); - } - public final <D extends RootOpenableDto, R extends DataGroupByDto<D>> void initReference(DataGroupByDtoSet<D, R> references) { if (references == null) { return; ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.62</version> + <version>2022.63</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -170,7 +170,7 @@ <dependency> <groupId>com.github.ben-manes.caffeine</groupId> <artifactId>caffeine</artifactId> - <version>3.1.0</version> + <version>${lib.version.caffeine}</version> </dependency> <dependency> <groupId>com.google.auto.service</groupId> @@ -190,7 +190,7 @@ <dependency> <groupId>com.google.errorprone</groupId> <artifactId>error_prone_annotations</artifactId> - <version>2.13.1</version> + <version>${lib.version.error_prone_annotations}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29613776042e8ac9faf4f38fb... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/29613776042e8ac9faf4f38fb... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT (＠tchemit)