Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b347c0bc by Tony Chemit at 2020-05-15T08:35:56+02:00 Impossible d'éditer un référentiel :( - Closes #1486 - - - - - 26 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Save.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/spi/ContentUIReferenceCache.java - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - dto-spi/pom.xml - dto/pom.xml - observe-i18n/pom.xml - persistence-spi/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - services-client/pom.xml - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services-validation/pom.xml - services/pom.xml - test-config/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -97,8 +97,7 @@ </dependency> <dependency> <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> + <artifactId>auto-service-annotations</artifactId> </dependency> <dependency> ===================================== client-core/pom.xml ===================================== @@ -207,6 +207,11 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> + <dependency> <groupId>io.ultreia.java4all.config</groupId> <artifactId>config-api</artifactId> ===================================== client-datasource-actions/pom.xml ===================================== @@ -29,8 +29,8 @@ <artifactId>client-datasource-actions</artifactId> - <name>ObServe :: Client DataSource actions</name> - <description>ObServe Client DataSource actions module</description> + <name>ObServe :: Client DataSource Actions</name> + <description>ObServe Client DataSource Actions module</description> <dependencies> @@ -162,6 +162,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -200,11 +204,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> </dependencies> ===================================== client-datasource-editor-api/pom.xml ===================================== @@ -185,6 +185,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -235,11 +239,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> </dependencies> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Save.java ===================================== @@ -75,7 +75,14 @@ public class Save<D extends ReferentialDto, R extends ReferentialDtoReference<D, try { boolean ok = doSave(ui, model.getBean(), notPersisted); if (ok) { - afterSave(ui, model.getBean(), notPersisted); + try { + model.setResetEdit(true); + afterSave(ui, model.getBean(), notPersisted); + } finally { + SwingValidatorUtil.setValidatorChanged(ui, false); + model.setResetEdit(false); + model.setModified(false); + } } } catch (Exception e) { UIHelper.handlingError(e); @@ -153,7 +160,6 @@ public class Save<D extends ReferentialDto, R extends ReferentialDtoReference<D, } private void afterSave(U ui, D bean, boolean notPersisted) { - SwingValidatorUtil.setValidatorChanged(ui, false); getDataSource().setModified(true); NavigationTree tree = getDataSourceEditor().getNavigationUI().getTree(); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/spi/ContentUIReferenceCache.java ===================================== @@ -226,7 +226,7 @@ public class ContentUIReferenceCache { log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - if (hideDisabledReferential && !propertyName.equals("referentialListHeader")) { + if (hideDisabledReferential && !propertyName.equals(FormDefinition.REFERENTIAL_LIST_HEADER)) { incomingReferences = DtoReferenceCollection.filterEnabled(incomingReferences); log.debug(String.format("Filter referential references (type %s - property %s), without disabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); } @@ -300,7 +300,7 @@ public class ContentUIReferenceCache { Boolean noLoad = (Boolean) list.getClientProperty(JaxxObjectInitializer.CLIENT_PROPERTY_LIST_NO_LOAD); List<R> data; String propertyName = list.getName(); - if (!"referentialListHeader".equals(propertyName) && (Objects.equals(true, noLoad) || form == null)) { + if (!FormDefinition.REFERENTIAL_LIST_HEADER.equals(propertyName) && (Objects.equals(true, noLoad) || form == null)) { log.debug(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { ===================================== client-datasource-editor-common/pom.xml ===================================== @@ -134,6 +134,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> @@ -189,11 +193,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> </dependencies> ===================================== client-datasource-editor-ll/pom.xml ===================================== @@ -170,6 +170,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -241,11 +245,6 @@ <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> </dependencies> ===================================== client-datasource-editor-ps/pom.xml ===================================== @@ -163,6 +163,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -244,11 +248,6 @@ <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> </dependencies> ===================================== client-runner/pom.xml ===================================== @@ -198,6 +198,16 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> + + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> @@ -217,11 +227,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> </dependencies> ===================================== dto-spi/pom.xml ===================================== @@ -39,6 +39,10 @@ <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-dto</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> ===================================== dto/pom.xml ===================================== @@ -115,6 +115,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -35,11 +35,9 @@ <i18n.artifactId>observe</i18n.artifactId> </properties> <dependencies> - <dependency> <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> + <artifactId>auto-service-annotations</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> ===================================== persistence-spi/pom.xml ===================================== @@ -50,12 +50,15 @@ <artifactId>common-persistence</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> ===================================== persistence/pom.xml ===================================== @@ -133,11 +133,16 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> <scope>provided</scope> </dependency> + <dependency> <groupId>javax.persistence</groupId> <artifactId>javax.persistence-api</artifactId> ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.25</version> + <version>2020.26</version> </parent> <groupId>fr.ird.observe</groupId> @@ -162,7 +162,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>4.30</lib.version.toolkit> + <lib.version.toolkit>4.31</lib.version.toolkit> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> <!--can't use 1.4.197 (date has changed + blob also)--> <lib.version.h2>1.4.196</lib.version.h2> ===================================== server-configuration/pom.xml ===================================== @@ -78,14 +78,9 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> - <!-- <dependency>--> - <!-- <groupId>com.google.guava</groupId>--> - <!-- <artifactId>guava</artifactId>--> - <!-- </dependency>--> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service-annotations</artifactId> - <scope>provided</scope> </dependency> <dependency> ===================================== server-core/pom.xml ===================================== @@ -194,11 +194,6 @@ <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> ===================================== services-client/pom.xml ===================================== @@ -133,12 +133,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> ===================================== services-local/pom.xml ===================================== @@ -19,7 +19,8 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -119,6 +120,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>javax.persistence</groupId> @@ -258,14 +263,18 @@ <executions> <execution> <id>update-test-dbs</id> - <goals><goal>test</goal></goals> + <goals> + <goal>test</goal> + </goals> <configuration> <test>fr.ird.observe.services.local.service.sql.MigrateTestsDatabases</test> </configuration> </execution> <execution> <id>default-test</id> - <goals><goal>test</goal></goals> + <goals> + <goal>test</goal> + </goals> <configuration> <skip>true</skip> </configuration> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== @@ -187,7 +187,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe public <D extends ReferentialDto> SaveResultDto save(D bean) { ReferentialDtoEntityContext<D, ?, ?, ?> spi = DbModelHelper.fromReferentialDtoWeak(bean); ReferentialEntity<D, ?> entity = loadOrCreateEntityFromReferentialDto(spi, bean); - entity.toDto(getReferentialLocale(), bean); + entity.fromDto(getReferentialLocale(), bean); return saveEntity(entity); } ===================================== services-validation/pom.xml ===================================== @@ -19,7 +19,8 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -68,10 +69,10 @@ <artifactId>common-validation</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> @@ -88,6 +89,10 @@ <groupId>io.ultreia.java4all</groupId> <artifactId>java-util</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -131,37 +136,37 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>io.ultreia.java4all.http</groupId> - <artifactId>http-maven-plugin</artifactId> - <executions> - <execution> - <id>default-generate-services-provider</id> - <goals> - <goal>generate-services-provider</goal> - </goals> - <configuration> - <packageName>fr.ird.observe.services</packageName> - <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> - <classPrefix>Observe</classPrefix> - <methodNameTranslatorName>package</methodNameTranslatorName> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>common-service</artifactId> - <version>${lib.version.toolkit}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-maven-plugin</artifactId> + <executions> + <execution> + <id>default-generate-services-provider</id> + <goals> + <goal>generate-services-provider</goal> + </goals> + <configuration> + <packageName>fr.ird.observe.services</packageName> + <serviceType>fr.ird.observe.services.service.ObserveService</serviceType> + <classPrefix>Observe</classPrefix> + <methodNameTranslatorName>package</methodNameTranslatorName> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>fr.ird.observe.toolkit</groupId> + <artifactId>common-service</artifactId> + <version>${lib.version.toolkit}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>services</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> </build> </project> ===================================== services/pom.xml ===================================== @@ -122,6 +122,10 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== test-config/pom.xml ===================================== @@ -48,12 +48,15 @@ <artifactId>common-dto</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> ===================================== test/pom.xml ===================================== @@ -38,12 +38,6 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> ===================================== validation/pom.xml ===================================== @@ -18,7 +18,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -62,10 +63,10 @@ <scope>test</scope> </dependency> -<dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> -</dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -81,6 +82,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>fr.ird.observe.toolkit</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b347c0bc2a476f10d314297c68... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b347c0bc2a476f10d314297c68... You're receiving this email because of your account on gitlab.com.