This is an automated email from the git hooks/post-receive script. New commit to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6a8fd3665e9a5263d495533496bc0981023cd554 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 13 12:52:43 2016 +0200 Amélioration code de UnidirectionalReferentialSynchronizeCallbackRequests --- ...onalReferentialSynchronizeCallbackRequests.java | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeCallbackRequests.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeCallbackRequests.java index 9f59166..5ec2393 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeCallbackRequests.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/UnidirectionalReferentialSynchronizeCallbackRequests.java @@ -4,8 +4,9 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.Set; +import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; /** * Représente l'ensemble des demandes au call back utilisateur. @@ -15,28 +16,32 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public class UnidirectionalReferentialSynchronizeCallbackRequests { +public class UnidirectionalReferentialSynchronizeCallbackRequests implements Iterable<UnidirectionalReferentialSynchronizeCallbackRequest<?>> { - private final Set<UnidirectionalReferentialSynchronizeCallbackRequest<?>> callbackRequests; + private final Map<String, UnidirectionalReferentialSynchronizeCallbackRequest<?>> callbackRequests; public UnidirectionalReferentialSynchronizeCallbackRequests() { - callbackRequests = new LinkedHashSet<>(); + this.callbackRequests = new TreeMap<>(); } public <R extends ReferentialDto> void addCallbackRequest(String referentialName, - Collection<ReferentialReference<R>> referentialsToReplace, - Collection<ReferentialReference<R>> availableReferentials) { + Collection<ReferentialReference<R>> referentialsToReplace, + Collection<ReferentialReference<R>> availableReferentials) { UnidirectionalReferentialSynchronizeCallbackRequest<R> callbackRequest = new UnidirectionalReferentialSynchronizeCallbackRequest<>(referentialName, referentialsToReplace, availableReferentials); - callbackRequests.add(callbackRequest); + callbackRequests.put(referentialName, callbackRequest); } - public Set<UnidirectionalReferentialSynchronizeCallbackRequest<?>> getCallbackRequests() { - return callbackRequests; + public UnidirectionalReferentialSynchronizeCallbackRequest<?> getCallbackRequest(String referentialName) { + return callbackRequests.get(referentialName); } public boolean isNotEmpty() { return !callbackRequests.isEmpty(); } + @Override + public Iterator<UnidirectionalReferentialSynchronizeCallbackRequest<?>> iterator() { + return callbackRequests.values().iterator(); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.