September 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] fix entity binder
by Tony CHEMIT 18 Sep '18

18 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0cae1bac by Tony CHEMIT at 2018-09-18T01:46:58Z fix entity binder - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/binder/data/seine/NonTargetCatchEntityReferenceBinder.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/binder/data/seine/NonTargetCatchEntityReferenceBinder.java ===================================== @@ -28,6 +28,8 @@ import fr.ird.observe.dto.data.seine.NonTargetCatchReference; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.seine.NonTargetCatch; +import java.util.Optional; + /** * Created on 24/11/15. * @@ -41,9 +43,8 @@ public class NonTargetCatchEntityReferenceBinder extends DataEntityReferenceBind @Override public NonTargetCatchReference toReference(ReferentialLocale referentialLocale, NonTargetCatch entity) { - return new NonTargetCatchReference(entity, entity.getSpecies().getScientificLabel(), - entity.getSpeciesFate().getLabel(referentialLocale)); + Optional.ofNullable(entity.getSpeciesFate()).map(e->e.getLabel(referentialLocale)).orElse(null)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0cae1bac16c8416cd5bca9b7b34… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0cae1bac16c8416cd5bca9b7b34… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] use last toolkit to fix topia generation
by Tony CHEMIT 18 Sep '18

18 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e49cfbfd by Tony CHEMIT at 2018-09-18T01:37:32Z use last toolkit to fix topia generation - - - - - 2 changed files: - persistence/pom.xml - pom.xml Changes: ===================================== persistence/pom.xml ===================================== @@ -264,6 +264,7 @@ <input>friend:target/models:*.model</input> </inputs> <templates> + org.nuiton.topia.templates.TopiaEntityDaoTransformer, org.nuiton.topia.templates.TopiaMetaTransformer, org.nuiton.topia.templates.TopiaMetadataModelGenerator </templates> ===================================== pom.xml ===================================== @@ -152,7 +152,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.6</observeToolkitVersion> + <observeToolkitVersion>3.7.7-SNAPSHOT</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  @@ -160,6 +160,7 @@   <lib.version.h2>1.4.196</lib.version.h2> +     View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e49cfbfda8b31750e10d1a5cd32… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e49cfbfda8b31750e10d1a5cd32… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Problème de socket en RC18 en connexion serveur directe à Tomcat (pas de HTTPD) - Closes #1053
by Tony CHEMIT 18 Sep '18

18 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 4862fc3a by Tony CHEMIT at 2018-09-18T00:17:39Z Problème de socket en RC18 en connexion serveur directe à Tomcat (pas de HTTPD) - Closes #1053 - - - - - 2 changed files: - server/src/main/filtered-resources/mapping - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== server/src/main/filtered-resources/mapping ===================================== @@ -223,7 +223,7 @@ POST /api/v1/data/seine/TripSeineService/save POST /api/v1/referential/ReferentialService/computeMissingReferential v1.referential.ReferentialServiceRestApi.computeMissingReferential DELETE /api/v1/referential/ReferentialService/delete v1.referential.ReferentialServiceRestApi.delete GET /api/v1/referential/ReferentialService/exists v1.referential.ReferentialServiceRestApi.exists -GET /api/v1/referential/ReferentialService/findAllUsages v1.referential.ReferentialServiceRestApi.findAllUsages +POST /api/v1/referential/ReferentialService/findAllUsages v1.referential.ReferentialServiceRestApi.findAllUsages GET /api/v1/referential/ReferentialService/getReferenceSet v1.referential.ReferentialServiceRestApi.getReferenceSet POST /api/v1/referential/ReferentialService/getReferentialIds v1.referential.ReferentialServiceRestApi.getReferentialIds GET /api/v1/referential/ReferentialService/getReferentialReferenceSets v1.referential.ReferentialServiceRestApi.getReferentialReferenceSets ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -107,7 +107,7 @@ public interface ReferentialService extends ObserveService { @Write <E extends ReferentialDto> void replaceReference(Class<E> beanType, String idToReplace, String replaceId); - @Get + @Post(useMultiPartForm = true) @ReadReferentialPermission @ReadDataPermission <R extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(R bean); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4862fc3ab8d1dccf98fdc069b49… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4862fc3ab8d1dccf98fdc069b49… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS][LL] La synchro avancée de marées plante - Closes #1050
by Tony CHEMIT 17 Sep '18

17 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b738d07a by Tony CHEMIT at 2018-09-17T23:33:38Z [PS][LL] La synchro avancée de marées plante - Closes #1050 - - - - - 6 changed files: - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java - services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java - services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java - services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java Changes: ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java ===================================== @@ -87,7 +87,7 @@ public interface UnidirectionalReferentialSynchronizeLocalService extends Observ //tc-20160713 On ne met pas cette permission, car il s'agit d'appliquer un script sql, sans avoir besoin des droits applicatifs // @WriteReferentialPermission @Write - @Post + @Post(useMultiPartForm = true) void applySqlRequests(ImmutableSet<String> sqlRequests); @ReadReferentialPermission ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java ===================================== @@ -40,7 +40,7 @@ public interface ReferentialSynchronizeService extends ObserveService { // Note : sur cette méthode aucun droit métier à poser, les actions sont légitimes @Write - @Post + @Post(useMultiPartForm = true) void executeSqlsRequests(ReferentialSynchronizeSqlsRequest localSqlsRequest, ReferentialSynchronizeSqlsRequest oppositeSqlsRequest); } ===================================== services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java ===================================== @@ -35,7 +35,7 @@ import io.ultreia.java4all.http.spi.Get; */ public interface NavigationService extends ObserveService { - @Get + @Get(useMultiPartForm = true) NavigationResult getNavigation(NavigationRequest request); @Get ===================================== services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.data; * 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>. @@ -39,16 +39,16 @@ public interface TripManagementService extends ObserveService { @ReadDataPermission @ReadReferentialPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) ExportTripResult exportTrip(ExportTripRequest exportRequest); @WriteDataPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) @Write DeleteTripResult deleteTrip(DeleteTripRequest request); @WriteDataPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) @Write ImportTripResult importTrip(ImportTripRequest request); ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -124,12 +124,12 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @ReadDataPermission - @Post + @Post(useMultiPartForm = true) MissingReferentialResult computeMissingReferential(MissingReferentialRequest request); @ReadReferentialPermission @WriteDataPermission - @Post + @Post(useMultiPartForm = true) @Write void insertMissingReferential(TopiaSqlScript sqlContent); ===================================== services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.services.service.sql; * #L% */ -import org.nuiton.topia.persistence.script.TopiaSqlScript; import fr.ird.observe.services.service.ObserveService; import io.ultreia.java4all.http.spi.Get; +import org.nuiton.topia.persistence.script.TopiaSqlScript; /** * Created on 31/12/15. @@ -33,9 +33,9 @@ import io.ultreia.java4all.http.spi.Get; */ public interface SqlScriptProducerService extends ObserveService { - @Get + @Get(useMultiPartForm = true) TopiaSqlScript produceAddSqlScript(AddSqlScriptProducerRequest request); - @Get + @Get(useMultiPartForm = true) TopiaSqlScript produceDeleteSqlScript(DeleteSqlScriptProducerRequest request); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b738d07a2d08debdb5a659fdabe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b738d07a2d08debdb5a659fdabe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS][LL] La synchro avancée de marées plante - Closes #1050
by Tony CHEMIT 17 Sep '18

17 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: a0ee5cff by Tony CHEMIT at 2018-09-17T23:32:08Z [PS][LL] La synchro avancée de marées plante - Closes #1050 - - - - - 6 changed files: - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java - services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java - services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java - services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java Changes: ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java ===================================== @@ -87,7 +87,7 @@ public interface UnidirectionalReferentialSynchronizeLocalService extends Observ //tc-20160713 On ne met pas cette permission, car il s'agit d'appliquer un script sql, sans avoir besoin des droits applicatifs // @WriteReferentialPermission @Write - @Post + @Post(useMultiPartForm = true) void applySqlRequests(ImmutableSet<String> sqlRequests); @ReadReferentialPermission ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java ===================================== @@ -40,7 +40,7 @@ public interface ReferentialSynchronizeService extends ObserveService { // Note : sur cette méthode aucun droit métier à poser, les actions sont légitimes @Write - @Post + @Post(useMultiPartForm = true) void executeSqlsRequests(ReferentialSynchronizeSqlsRequest localSqlsRequest, ReferentialSynchronizeSqlsRequest oppositeSqlsRequest); } ===================================== services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java ===================================== @@ -35,7 +35,7 @@ import io.ultreia.java4all.http.spi.Get; */ public interface NavigationService extends ObserveService { - @Get + @Get(useMultiPartForm = true) NavigationResult getNavigation(NavigationRequest request); @Get ===================================== services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.data; * 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>. @@ -39,16 +39,16 @@ public interface TripManagementService extends ObserveService { @ReadDataPermission @ReadReferentialPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) ExportTripResult exportTrip(ExportTripRequest exportRequest); @WriteDataPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) @Write DeleteTripResult deleteTrip(DeleteTripRequest request); @WriteDataPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) @Write ImportTripResult importTrip(ImportTripRequest request); ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -129,7 +129,7 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @WriteDataPermission - @Post + @Post(useMultiPartForm = true) @Write void insertMissingReferential(TopiaSqlScript sqlContent); ===================================== services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.services.service.sql; * #L% */ -import org.nuiton.topia.persistence.script.TopiaSqlScript; import fr.ird.observe.services.service.ObserveService; import io.ultreia.java4all.http.spi.Get; +import org.nuiton.topia.persistence.script.TopiaSqlScript; /** * Created on 31/12/15. @@ -33,9 +33,9 @@ import io.ultreia.java4all.http.spi.Get; */ public interface SqlScriptProducerService extends ObserveService { - @Get + @Get(useMultiPartForm = true) TopiaSqlScript produceAddSqlScript(AddSqlScriptProducerRequest request); - @Get + @Get(useMultiPartForm = true) TopiaSqlScript produceDeleteSqlScript(DeleteSqlScriptProducerRequest request); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a0ee5cff26b8ead8157ef6c4c68… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a0ee5cff26b8ead8157ef6c4c68… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS][LL] La synchro avancée de marées plante - Closes #1050
by Tony CHEMIT 17 Sep '18

17 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b4289782 by Tony CHEMIT at 2018-09-17T23:25:12Z [PS][LL] La synchro avancée de marées plante - Closes #1050 - - - - - 5 changed files: - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java - services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java - services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java - services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java Changes: ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java ===================================== @@ -87,7 +87,7 @@ public interface UnidirectionalReferentialSynchronizeLocalService extends Observ //tc-20160713 On ne met pas cette permission, car il s'agit d'appliquer un script sql, sans avoir besoin des droits applicatifs // @WriteReferentialPermission @Write - @Post + @Post(useMultiPartForm = true) void applySqlRequests(ImmutableSet<String> sqlRequests); @ReadReferentialPermission ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java ===================================== @@ -40,7 +40,7 @@ public interface ReferentialSynchronizeService extends ObserveService { // Note : sur cette méthode aucun droit métier à poser, les actions sont légitimes @Write - @Post + @Post(useMultiPartForm = true) void executeSqlsRequests(ReferentialSynchronizeSqlsRequest localSqlsRequest, ReferentialSynchronizeSqlsRequest oppositeSqlsRequest); } ===================================== services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java ===================================== @@ -35,7 +35,7 @@ import io.ultreia.java4all.http.spi.Get; */ public interface NavigationService extends ObserveService { - @Get + @Get(useMultiPartForm = true) NavigationResult getNavigation(NavigationRequest request); @Get ===================================== services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.data; * 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>. @@ -39,16 +39,16 @@ public interface TripManagementService extends ObserveService { @ReadDataPermission @ReadReferentialPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) ExportTripResult exportTrip(ExportTripRequest exportRequest); @WriteDataPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) @Write DeleteTripResult deleteTrip(DeleteTripRequest request); @WriteDataPermission - @Post(timeOut = 120) + @Post(timeOut = 120, useMultiPartForm = true) @Write ImportTripResult importTrip(ImportTripRequest request); ===================================== services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.services.service.sql; * #L% */ -import org.nuiton.topia.persistence.script.TopiaSqlScript; import fr.ird.observe.services.service.ObserveService; import io.ultreia.java4all.http.spi.Get; +import org.nuiton.topia.persistence.script.TopiaSqlScript; /** * Created on 31/12/15. @@ -33,9 +33,9 @@ import io.ultreia.java4all.http.spi.Get; */ public interface SqlScriptProducerService extends ObserveService { - @Get + @Get(useMultiPartForm = true) TopiaSqlScript produceAddSqlScript(AddSqlScriptProducerRequest request); - @Get + @Get(useMultiPartForm = true) TopiaSqlScript produceDeleteSqlScript(DeleteSqlScriptProducerRequest request); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4289782ced0954f78a1fe834f4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4289782ced0954f78a1fe834f4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] add more log when can not get Call.ParameterTree
by Tony CHEMIT 17 Sep '18

17 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 78efde62 by Tony CHEMIT at 2018-09-17T21:29:35Z add more log when can not get Call.ParameterTree - - - - - 1 changed file: - server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java Changes: ===================================== server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java ===================================== @@ -27,8 +27,8 @@ import com.google.gson.JsonParseException; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.http.HRestClientService; import org.apache.commons.beanutils.converters.AbstractConverter; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; @@ -58,7 +58,13 @@ public class ObserveDtoInjector extends AbstractConverter implements ExecutorPar ObserveDto observeDto = null; if (ObserveDto.class.isAssignableFrom(type)) { - Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); + Call.ParameterTree parameterTree; + try { + parameterTree = call.getParameterTree().getObject().get(name); + } catch (RuntimeException e) { + log.error(String.format("Could not get parameterTree for mapping: %s, call: %s - name: %s, type: %s", mapping, call, name, type), e); + throw e; + } String gsonContent = ((String[]) parameterTree.getValue())[0]; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/78efde62889b4b40aa24e945045… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/78efde62889b4b40aa24e945045… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Suppression de lignes de référentiel : liste de ceux qui plantent avec erreur de…
by Tony CHEMIT 17 Sep '18

17 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 92c5ada3 by Tony CHEMIT at 2018-09-17T17:53:40Z Suppression de lignes de référentiel : liste de ceux qui plantent avec erreur de type Dto - Closes #1051 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -152,7 +152,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.5</observeToolkitVersion> + <observeToolkitVersion>3.7.6</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/92c5ada3b29df485c45bae8b36f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/92c5ada3b29df485c45bae8b36f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] use last toolkit to solve gson problems... - See 1051
by Tony CHEMIT 17 Sep '18

17 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 525b7b37 by Tony CHEMIT at 2018-09-17T16:21:58Z use last toolkit to solve gson problems... - See 1051 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -152,7 +152,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.5</observeToolkitVersion> + <observeToolkitVersion>3.7.6-SNAPSHOT</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/525b7b37914b4715b3142999e6f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/525b7b37914b4715b3142999e6f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Suppression de lignes de référentiel : liste de ceux qui plantent avec erreurs…
by Tony CHEMIT 17 Sep '18

17 Sep '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 50c96c4a by Tony CHEMIT at 2018-09-17T15:27:45Z Suppression de lignes de référentiel : liste de ceux qui plantent avec erreurs spécifiques - Closes #1052 - - - - - 8 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java ===================================== @@ -38,6 +38,7 @@ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.form.FormDefinition; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.I18nReferentialDto; import fr.ird.observe.dto.referential.ProgramDto; @@ -51,8 +52,8 @@ import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableSetDtoMap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.runtime.swing.CardLayout2Ext; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; @@ -166,7 +167,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer } private static <E extends ReferentialDto, R extends ReferentialDtoReference<E, R>> Pair<Boolean, R> showUsagesForDelete(E entity, - ImmutableSetDtoMap<ReferentialDtoReference> usages, + ImmutableSetDtoMap<DtoReference> usages, List<R> referenceList) { DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService(); @@ -205,7 +206,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer } private static <E extends ReferentialDto, R extends ReferentialDtoReference<E, R>> Pair<Boolean, R> showUsagesForDesactivated(E entity, - ImmutableSetDtoMap<ReferentialDtoReference> usages, + ImmutableSetDtoMap<DtoReference> usages, List<R> referenceList) { DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService(); @@ -393,7 +394,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer } // recherche des utilisation du bean dans la base - ImmutableSetDtoMap<ReferentialDtoReference> usages = getReferentialService().findAllUsages(bean); + ImmutableSetDtoMap<DtoReference> usages = getReferentialService().findAllUsages(bean); DecoratorService dService = getDecoratorService(); Decorator<D> decorator = dService.getDecoratorByType(getBeanType()); @@ -692,7 +693,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer log.debug("entity status was desactivated, looking for usage"); } - ImmutableSetDtoMap<ReferentialDtoReference> usages = getReferentialService().findAllUsages(bean); + ImmutableSetDtoMap<DtoReference> usages = getReferentialService().findAllUsages(bean); if (usages.isEmpty()) { if (log.isInfoEnabled()) { @@ -766,7 +767,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer } // recherche des utilisation du bean dans la base - ImmutableSetDtoMap<ReferentialDtoReference> usages = getReferentialService().findAllUsages(bean); + ImmutableSetDtoMap<DtoReference> usages = getReferentialService().findAllUsages(bean); R replaceReference = null; ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUI.jaxx ===================================== @@ -26,6 +26,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <import> fr.ird.observe.spi.map.ImmutableSetDtoMap + fr.ird.observe.dto.reference.DtoReference fr.ird.observe.dto.reference.ReferentialDtoReference org.nuiton.jaxx.runtime.context.JAXXInitialContext org.nuiton.jaxx.widgets.select.BeanFilterableComboBox @@ -36,7 +37,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <script><![CDATA[ -public static <R extends ReferentialDtoReference> UsageForDeleteUI<R> build(String message, ImmutableSetDtoMap<ReferentialDtoReference> usages, List references) { +public static <R extends ReferentialDtoReference> UsageForDeleteUI<R> build(String message, ImmutableSetDtoMap<? extends DtoReference> usages, List references) { return new UsageForDeleteUI<>(new JAXXInitialContext().add(message).add(usages).add(references)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUI.jaxx ===================================== @@ -24,6 +24,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <JPanel layout='{new BorderLayout()}' genericType="R extends ReferentialDtoReference"> <import> + fr.ird.observe.dto.reference.DtoReference fr.ird.observe.dto.reference.ReferentialDtoReference fr.ird.observe.spi.map.ImmutableSetDtoMap @@ -36,7 +37,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <script><![CDATA[ -public static <R extends ReferentialDtoReference> UsageForDesactivateUI<R> build(String message, ImmutableSetDtoMap<ReferentialDtoReference> usages, List references) { +public static <R extends ReferentialDtoReference> UsageForDesactivateUI<R> build(String message, ImmutableSetDtoMap<? extends DtoReference> usages, List references) { return new UsageForDesactivateUI<>(new JAXXInitialContext().add(message).add(usages).add(references)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUI.jaxx ===================================== @@ -25,6 +25,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <import> + fr.ird.observe.dto.reference.DtoReference fr.ird.observe.dto.reference.ReferentialDtoReference fr.ird.observe.spi.map.ImmutableSetDtoMap org.nuiton.jaxx.runtime.context.JAXXInitialContext @@ -34,7 +35,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <script><![CDATA[ -public static <R extends ReferentialDtoReference> UsageForDisplayUI<R> build(String message, ImmutableSetDtoMap<ReferentialDtoReference> usages) { +public static <R extends ReferentialDtoReference> UsageForDisplayUI<R> build(String message, ImmutableSetDtoMap<? extends DtoReference> usages) { return new UsageForDisplayUI<>(new JAXXInitialContext().add(message).add(usages)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java ===================================== @@ -24,9 +24,11 @@ package fr.ird.observe.client.ui.content.ref.usage; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; @@ -91,9 +93,12 @@ public abstract class UsageUIHandlerSupport<R extends ReferentialDtoReference, U Set references = usages.get(dtoType); String typeTitle = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType)); addReferentialReferenceUsages(dtoType, references, typeTitle); - } - + for (Class<? extends DataDtoReference> dtoType : usages.dataReferenceTypes()) { + Set references = usages.get(dtoType); + String typeTitle = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType)); + addDataReferenceUsages(dtoType, references, typeTitle); + } } BeanFilterableComboBox<R> comboBox = getReplace(); @@ -119,18 +124,18 @@ public abstract class UsageUIHandlerSupport<R extends ReferentialDtoReference, U }); } -// protected <D extends DataDto, R extends DataDtoReference<D, R>> void addDataReferenceUsages(Class<R> dtoType, -// Set<R> references, -// String typeTitle) { -// -// String typetitle = n("observe.common.Dto.label.usage.data.title"); -// typetitle = t(typetitle, typeTitle, references.size()); -// -// Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDataReferenceDecorator(dtoType); -// Objects.requireNonNull(decorator, "could not find decorator for type " + dtoType); -// -// buildUsagePanel(decorator, references, typetitle); -// } + protected <D extends DataDto, R extends DataDtoReference<D, R>> void addDataReferenceUsages(Class<R> dtoType, + Set<R> references, + String typeTitle) { + + String typetitle = n("observe.common.Dto.label.usage.data.title"); + typetitle = t(typetitle, typeTitle, references.size()); + + Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDataReferenceDecorator(dtoType); + Objects.requireNonNull(decorator, "could not find decorator for type " + dtoType); + + buildUsagePanel(decorator, references, typetitle); + } protected <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> void addReferentialReferenceUsages(Class<R> referenceType, ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.51</version> + <version>2018.53</version> </parent> <groupId>fr.ird.observe</groupId> @@ -152,9 +152,8 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.4</observeToolkitVersion> - <lib.version.java4all.http>1.0.12</lib.version.java4all.http> - <lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx> + <observeToolkitVersion>3.7.5</observeToolkitVersion> +  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <xworkVersion>2.3.35</xworkVersion> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.referential; * 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>. @@ -25,11 +25,16 @@ package fr.ird.observe.services.local.service.referential; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.binder.data.DataEntityReferenceBinderSupport; import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport; import fr.ird.observe.binder.referential.ReferentialEntityReferenceBinderSupport; import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.form.FormDefinition; +import fr.ird.observe.dto.reference.DataDtoReference; +import fr.ird.observe.dto.reference.DataDtoReferenceSet; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferenceStatus; @@ -39,6 +44,7 @@ import fr.ird.observe.dto.referential.SpeciesGroupDto; import fr.ird.observe.dto.referential.seine.ObservedSystemReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.EntityMap; +import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Species; @@ -59,13 +65,14 @@ import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.spi.DtoModelClasses; import fr.ird.observe.spi.DtoModelHelper; +import fr.ird.observe.spi.context.DataEntityContext; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.context.ReferentialEntityContext; import fr.ird.observe.spi.context.ReferentialReferenceEntityContext; import fr.ird.observe.spi.map.ImmutableDtoMap; import fr.ird.observe.spi.map.ImmutableSetDtoMap; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; @@ -208,7 +215,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe } @Override - public <D extends ReferentialDto> ImmutableSetDtoMap<ReferentialDtoReference> findAllUsages(D bean) { + public <D extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(D bean) { ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(bean); Class<ObserveReferentialEntity> entityType = spi.toEntityType(); @@ -218,12 +225,14 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe TopiaDao<ObserveReferentialEntity> dao = getTopiaPersistenceContext().getDao(entityType); EntityMap allUsages = new EntityMap(dao.findAllUsages(entity)); - ImmutableSetDtoMap.Builder<ReferentialDtoReference> result = ImmutableSetDtoMap.builder(); + ImmutableSetDtoMap.Builder<DtoReference> result = ImmutableSetDtoMap.builder(); for (Class<? extends TopiaEntity> type : allUsages.keySet()) { List<? extends TopiaEntity> entities = allUsages.get(type); if (ObserveReferentialEntity.class.isAssignableFrom(type)) { //noinspection unchecked - findAllUsageReferential(DbModelHelper.fromReferentialEntity((Class) type), (List) entities, result); + addAllReferentialUsage(DbModelHelper.fromReferentialEntity((Class) type), (List) entities, result); + } else { + adddAllDataUsage(DbModelHelper.fromDataEntity((Class) type), (List) entities, result); } } return result.build(); @@ -242,13 +251,20 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe return result; } - private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void findAllUsageReferential(ReferentialEntityContext<D, R, E> spi, List<E> entities, ImmutableSetDtoMap.Builder<ReferentialDtoReference> result) { + private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void addAllReferentialUsage(ReferentialEntityContext<D, R, E> spi, List<E> entities, ImmutableSetDtoMap.Builder<DtoReference> result) { Class<R> referenceType = spi.toReferenceType(); ReferentialEntityReferenceBinderSupport<D, R, E> binder = spi.toEntityReferenceBinder(); ReferentialDtoReferenceSet<R> referenceSet = toReferentialReferenceSet(binder, entities, null); result.put(referenceType, referenceSet.toSet()); } + private <D extends DataDto, R extends DataDtoReference<D, R>, E extends ObserveDataEntity> void adddAllDataUsage(DataEntityContext<D, R, E> spi, List<E> entities, ImmutableSetDtoMap.Builder<DtoReference> result) { + Class<R> referenceType = spi.toReferenceType(); + DataEntityReferenceBinderSupport<D, R, E> binder = spi.toEntityReferenceBinder(); + DataDtoReferenceSet<R> referenceSet = toDataReferenceSet(binder, entities); + result.put(referenceType, referenceSet.toSet()); + } + @Override public <D extends ReferentialDto> boolean exists(Class<D> type, String id) { if (log.isTraceEnabled()) { ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.referential; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialDto; @@ -32,7 +33,6 @@ import fr.ird.observe.dto.referential.SpeciesDto; import fr.ird.observe.dto.referential.SpeciesGroupDto; import fr.ird.observe.dto.referential.seine.ObservedSystemReference; import fr.ird.observe.dto.result.SaveResultDto; -import org.nuiton.topia.persistence.script.TopiaSqlScript; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.ReadReferentialPermission; @@ -44,6 +44,7 @@ import io.ultreia.java4all.http.spi.Delete; import io.ultreia.java4all.http.spi.Get; import io.ultreia.java4all.http.spi.Nullable; import io.ultreia.java4all.http.spi.Post; +import org.nuiton.topia.persistence.script.TopiaSqlScript; import java.util.Date; import java.util.List; @@ -109,7 +110,7 @@ public interface ReferentialService extends ObserveService { @Get @ReadReferentialPermission @ReadDataPermission - <R extends ReferentialDto> ImmutableSetDtoMap<ReferentialDtoReference> findAllUsages(R bean); + <R extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(R bean); @Get @ReadReferentialPermission View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/50c96c4a17a8d5c8ab966a6eb17… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/50c96c4a17a8d5c8ab966a6eb17… You're receiving this email because of your account on gitlab.com.

1 0