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 fix ReplicateRequestCallback accept method (dataType is an entity type and test is on dto type...) - See #2656 - - - - - 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: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/logbook/LogbookReplicateRequestCallback.java ===================================== @@ -48,7 +48,7 @@ public class LogbookReplicateRequestCallback implements ReplicateRequestCallback public boolean accept(ReplicateRequest request) { return request.getOldParentId().contains(".Trip#") && request.getNewParentId().contains(".Trip#") - && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.logbook.BusinessDataPackage.get().getPackageName()); + && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ll.logbook.BusinessDataPackage.get()); } @Override ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ObservationReplicateRequestCallback.java ===================================== @@ -48,7 +48,7 @@ public class ObservationReplicateRequestCallback implements ReplicateRequestCall public boolean accept(ReplicateRequest request) { return request.getOldParentId().contains(".Trip#") && request.getNewParentId().contains(".Trip#") - && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName()); + && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get()); } @Override ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/ObservationReplicateRequestCallback.java ===================================== @@ -52,7 +52,7 @@ public class ObservationReplicateRequestCallback implements ReplicateRequestCall public boolean accept(ReplicateRequest request) { return request.getOldParentId().contains(".Trip#") && request.getNewParentId().contains(".Trip#") - && request.getDataType().startsWith(fr.ird.observe.spi.module.ll.observation.BusinessDataPackage.get().getPackageName()); + && request.isDataTypeInDtoPackage(fr.ird.observe.spi.module.ps.observation.BusinessDataPackage.get()); } @Override ===================================== toolkit/api-datasource/src/main/java/fr/ird/observe/datasource/request/ReplicateRequest.java ===================================== @@ -22,6 +22,8 @@ package fr.ird.observe.datasource.request; * #L% */ +import fr.ird.observe.spi.module.BusinessDataPackage; + import java.util.Set; import java.util.StringJoiner; @@ -79,6 +81,10 @@ public class ReplicateRequest extends SqlServiceRequest { return new DeleteRequest(isPostgres(), getDataType(), dataIds.toArray(new String[0])); } + public boolean isDataTypeInDtoPackage(BusinessDataPackage dataPackage) { + return getDataType().replace("entities.", "dto.").startsWith(dataPackage.getPackageName()); + } + @Override public String toString() { return new StringJoiner(", ", ReplicateRequest.class.getSimpleName() + "[", "]") View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/690b2b9e1601ff0482e40bbe08... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/690b2b9e1601ff0482e40bbe08... You're receiving this email because of your account on gitlab.com.