Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe
Commits:
-
690b2b9e
by Tony Chemit at 2023-03-30T17:01:26+02:00
4 changed files:
- core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java
- core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java
- core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java
- toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java
Changes:
| ... | ... | @@ -48,7 +48,7 @@ public class LogbookReplicateRequestCallback implements ReplicateRequestCallback |
| 48 | 48 | public boolean accept(ReplicateRequest request) {
|
| 49 | 49 | return request.getOldParentId().contains(".Trip#")
|
| 50 | 50 | && request.getNewParentId().contains(".Trip#")
|
| 51 | - && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.logbook.BusinessDataPackage.get().getPackageName());
|
|
| 51 | + && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ll.logbook.BusinessDataPackage.get());
|
|
| 52 | 52 | }
|
| 53 | 53 | |
| 54 | 54 | @Override
|
| ... | ... | @@ -48,7 +48,7 @@ public class ObservationReplicateRequestCallback implements ReplicateRequestCall |
| 48 | 48 | public boolean accept(ReplicateRequest request) {
|
| 49 | 49 | return request.getOldParentId().contains(".Trip#")
|
| 50 | 50 | && request.getNewParentId().contains(".Trip#")
|
| 51 | - && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName());
|
|
| 51 | + && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get());
|
|
| 52 | 52 | }
|
| 53 | 53 | |
| 54 | 54 | @Override
|
| ... | ... | @@ -52,7 +52,7 @@ public class ObservationReplicateRequestCallback implements ReplicateRequestCall |
| 52 | 52 | public boolean accept(ReplicateRequest request) {
|
| 53 | 53 | return request.getOldParentId().contains(".Trip#")
|
| 54 | 54 | && request.getNewParentId().contains(".Trip#")
|
| 55 | - && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName());
|
|
| 55 | + && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ps.observation.BusinessDataPackage.get());
|
|
| 56 | 56 | }
|
| 57 | 57 | |
| 58 | 58 | @Override
|
| ... | ... | @@ -22,6 +22,8 @@ package fr.ird.observe.datasource.request; |
| 22 | 22 | * #L%
|
| 23 | 23 | */
|
| 24 | 24 | |
| 25 | +import fr.ird.observe.spi.module.BusinessDataPackage;
|
|
| 26 | + |
|
| 25 | 27 | import java.util.Set;
|
| 26 | 28 | import java.util.StringJoiner;
|
| 27 | 29 | |
| ... | ... | @@ -79,6 +81,10 @@ public class ReplicateRequest extends SqlServiceRequest { |
| 79 | 81 | return new DeleteRequest(isPostgres(), getDataType(), dataIds.toArray(new String[0]));
|
| 80 | 82 | }
|
| 81 | 83 | |
| 84 | + public boolean isDataTypeInDtoPackage(BusinessDataPackage dataPackage) {
|
|
| 85 | + return getDataType().replace("entities.", "dto.").startsWith(dataPackage.getPackageName());
|
|
| 86 | + }
|
|
| 87 | + |
|
| 82 | 88 | @Override
|
| 83 | 89 | public String toString() {
|
| 84 | 90 | return new StringJoiner(", ", ReplicateRequest.class.getSimpleName() + "[", "]")
|