Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
6c5d0ff9
by Tony Chemit at 2021-12-02T11:33:47+01:00
-
a81776f7
by Tony Chemit at 2021-12-02T11:53:24+01:00
-
a17f476b
by Tony Chemit at 2021-12-02T14:23:26+01:00
-
99ac65cf
by Tony Chemit at 2021-12-02T14:23:35+01:00
-
06597e25
by Tony Chemit at 2021-12-02T14:23:37+01:00
-
5eb9924b
by Tony Chemit at 2021-12-02T14:23:39+01:00
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:
| ... | ... | @@ -24,6 +24,7 @@ defaultContent=FIXME |
| 24 | 24 |
defaultId=FIXME
|
| 25 | 25 |
delete.id=${defaultId}
|
| 26 | 26 |
get.id=${defaultId}
|
| 27 |
+getOne.id=${defaultId}
|
|
| 27 | 28 |
post.id=${defaultId}
|
| 28 | 29 |
update.content=${defaultContent}
|
| 29 | 30 |
update.id=${defaultId}
|
| ... | ... | @@ -32,6 +32,7 @@ get.path=${defaultPath} |
| 32 | 32 |
getByModule.modelName=${defaultModelName}
|
| 33 | 33 |
getByModule.moduleName=${defaultModuleName}
|
| 34 | 34 |
getByPackage.packageName=${defaultPackageName}
|
| 35 |
+getOne.id=${defaultId}
|
|
| 35 | 36 |
post.id=${defaultId}
|
| 36 | 37 |
update.content=${defaultContent}
|
| 37 | 38 |
update.id=${defaultId}
|
| 1 |
+observe.service.actions.consolidate.LengthLengthParameterNotFound
|
|
| 2 |
+observe.service.actions.consolidate.lengthWeightParameterNotFound
|
|
| 3 |
+observe.service.actions.consolidate.noSex
|
|
| 4 |
+observe.services.topia.error.h2.database.locked
|
| ... | ... | @@ -101,7 +101,7 @@ public class DataEntityServiceLocalSupport extends ObserveServiceLocal implement |
| 101 | 101 |
|
| 102 | 102 |
@Override
|
| 103 | 103 |
public ToolkitId update(Class<? extends DataDto> dtoType, String id, String content) throws InvalidDataException {
|
| 104 |
- id = ObserveService.decodeId("id");
|
|
| 104 |
+ id = ObserveService.decodeId(id);
|
|
| 105 | 105 |
DataDtoEntityContext<?, ?, ?, ?> spi = PersistenceBusinessProject.fromDataDtoWeak(dtoType);
|
| 106 | 106 |
TopiaDao<?> dao = spi.getDao(getTopiaPersistenceContext());
|
| 107 | 107 |
DataEntity entity = (DataEntity) dao.forTopiaIdEquals(id).findUnique();
|
| ... | ... | @@ -113,7 +113,7 @@ public class DataEntityServiceLocalSupport extends ObserveServiceLocal implement |
| 113 | 113 |
|
| 114 | 114 |
@Override
|
| 115 | 115 |
public void delete(Class<? extends DataDto> dtoType, String id) {
|
| 116 |
- id = ObserveService.decodeId("id");
|
|
| 116 |
+ id = ObserveService.decodeId(id);
|
|
| 117 | 117 |
DataDtoEntityContext<? extends DataDto, ?, DataEntity, ?> spi = PersistenceBusinessProject.fromDataDto(dtoType);
|
| 118 | 118 |
DataEntity entity = spi.getDao(getTopiaPersistenceContext()).forTopiaIdEquals(id).findUniqueOrNull();
|
| 119 | 119 |
if (entity != null) {
|
| ... | ... | @@ -118,7 +118,7 @@ public class ReferentialEntityServiceLocalSupport extends ObserveServiceLocal im |
| 118 | 118 |
|
| 119 | 119 |
@Override
|
| 120 | 120 |
public void delete(Class<? extends ReferentialDto> dtoType, String id) {
|
| 121 |
- id = ObserveService.decodeId("id");
|
|
| 121 |
+ id = ObserveService.decodeId(id);
|
|
| 122 | 122 |
ReferentialEntity entity = getTopiaPersistenceContext().findByTopiaId(id);
|
| 123 | 123 |
if (entity != null) {
|
| 124 | 124 |
log.info(String.format("will delete entity: %s", entity.getTopiaId()));
|
| ... | ... | @@ -140,7 +140,7 @@ public class ReferentialEntityServiceLocalSupport extends ObserveServiceLocal im |
| 140 | 140 |
@SuppressWarnings({"rawtypes", "unchecked"})
|
| 141 | 141 |
@Override
|
| 142 | 142 |
public ToolkitId update(Class<? extends ReferentialDto> dtoType, String id, String content) throws InvalidDataException {
|
| 143 |
- id = ObserveService.decodeId("id");
|
|
| 143 |
+ id = ObserveService.decodeId(id);
|
|
| 144 | 144 |
ReferentialDtoEntityContext spi = PersistenceBusinessProject.fromReferentialDtoWeak(dtoType);
|
| 145 | 145 |
TopiaDao<?> dao = spi.getDao(getTopiaPersistenceContext());
|
| 146 | 146 |
ReferentialEntity entity = (ReferentialEntity) dao.forTopiaIdEquals(id).findUnique();
|