[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-21' with...

2 Dec 2021


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
6c5d0ff9 by Tony Chemit at 2021-12-02T11:33:47+01:00
[jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-21' with non-snapshot versions[skip ci]
- - - - -
a81776f7 by Tony Chemit at 2021-12-02T11:53:24+01:00
Amélioration de l'API pour supporter le JSON-Encoded POST/PUT data - See ultreiaio/ird-observe#2131

- - - - -
a17f476b by Tony Chemit at 2021-12-02T14:23:26+01:00
[jgitflow-maven-plugin]merging 'release/9.0.0-RC-21' into 'master'
- - - - -
99ac65cf by Tony Chemit at 2021-12-02T14:23:35+01:00
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
- - - - -
06597e25 by Tony Chemit at 2021-12-02T14:23:37+01:00
[jgitflow-maven-plugin]merging 'master' into 'develop'
- - - - -
5eb9924b by Tony Chemit at 2021-12-02T14:23:39+01:00
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
- - - - -


5 changed files:

- services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/api/DataEntityService.properties
- services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/api/ReferentialEntityService.properties
- services/local-impl/src/main/i18n/getters/java.getter
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/api/DataEntityServiceLocalSupport.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/api/ReferentialEntityServiceLocalSupport.java


Changes:

=====================================
services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/api/DataEntityService.properties
=====================================
@@ -24,6 +24,7 @@ defaultContent=FIXME
 defaultId=FIXME
 delete.id=${defaultId}
 get.id=${defaultId}
+getOne.id=${defaultId}
 post.id=${defaultId}
 update.content=${defaultContent}
 update.id=${defaultId}


=====================================
services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/api/ReferentialEntityService.properties
=====================================
@@ -32,6 +32,7 @@ get.path=${defaultPath}
 getByModule.modelName=${defaultModelName}
 getByModule.moduleName=${defaultModuleName}
 getByPackage.packageName=${defaultPackageName}
+getOne.id=${defaultId}
 post.id=${defaultId}
 update.content=${defaultContent}
 update.id=${defaultId}


=====================================
services/local-impl/src/main/i18n/getters/java.getter
=====================================
@@ -0,0 +1,4 @@
+observe.service.actions.consolidate.LengthLengthParameterNotFound
+observe.service.actions.consolidate.lengthWeightParameterNotFound
+observe.service.actions.consolidate.noSex
+observe.services.topia.error.h2.database.locked


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/api/DataEntityServiceLocalSupport.java
=====================================
@@ -101,7 +101,7 @@ public class DataEntityServiceLocalSupport extends ObserveServiceLocal implement
 
     @Override
     public ToolkitId update(Class<? extends DataDto> dtoType, String id, String content) throws InvalidDataException {
-        id = ObserveService.decodeId("id");
+        id = ObserveService.decodeId(id);
         DataDtoEntityContext<?, ?, ?, ?> spi = PersistenceBusinessProject.fromDataDtoWeak(dtoType);
         TopiaDao<?> dao = spi.getDao(getTopiaPersistenceContext());
         DataEntity entity = (DataEntity) dao.forTopiaIdEquals(id).findUnique();
@@ -113,7 +113,7 @@ public class DataEntityServiceLocalSupport extends ObserveServiceLocal implement
 
     @Override
     public void delete(Class<? extends DataDto> dtoType, String id) {
-        id = ObserveService.decodeId("id");
+        id = ObserveService.decodeId(id);
         DataDtoEntityContext<? extends DataDto, ?, DataEntity, ?> spi = PersistenceBusinessProject.fromDataDto(dtoType);
         DataEntity entity = spi.getDao(getTopiaPersistenceContext()).forTopiaIdEquals(id).findUniqueOrNull();
         if (entity != null) {


=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/api/ReferentialEntityServiceLocalSupport.java
=====================================
@@ -118,7 +118,7 @@ public class ReferentialEntityServiceLocalSupport extends ObserveServiceLocal im
 
     @Override
     public void delete(Class<? extends ReferentialDto> dtoType, String id) {
-        id = ObserveService.decodeId("id");
+        id = ObserveService.decodeId(id);
         ReferentialEntity entity = getTopiaPersistenceContext().findByTopiaId(id);
         if (entity != null) {
             log.info(String.format("will delete entity: %s", entity.getTopiaId()));
@@ -140,7 +140,7 @@ public class ReferentialEntityServiceLocalSupport extends ObserveServiceLocal im
     @SuppressWarnings({"rawtypes", "unchecked"})
     @Override
     public ToolkitId update(Class<? extends ReferentialDto> dtoType, String id, String content) throws InvalidDataException {
-        id = ObserveService.decodeId("id");
+        id = ObserveService.decodeId(id);
         ReferentialDtoEntityContext spi = PersistenceBusinessProject.fromReferentialDtoWeak(dtoType);
         TopiaDao<?> dao = spi.getDao(getTopiaPersistenceContext());
         ReferentialEntity entity = (ReferentialEntity) dao.forTopiaIdEquals(id).findUnique();



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6b7cd6c1ff578be2b9ea12f34...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6b7cd6c1ff578be2b9ea12f34...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)