This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 40dd1765dc4f0931be1e9b5f01e0e42aa55c495e Author: Yannick Martel <martel@©odelutin.com> Date: Tue Feb 24 11:59:58 2015 +0100 Fix loose of external experts when getting questions internal-test #6708 #6709 --- .../java/fr/ifremer/coselmar/converter/BeanEntityConverter.java | 6 ++++++ .../java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java index 3d50bbd..5e2bc97 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java @@ -29,6 +29,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; +import com.google.common.collect.Sets; import fr.ifremer.coselmar.beans.DocumentBean; import fr.ifremer.coselmar.beans.QuestionBean; import fr.ifremer.coselmar.beans.UserBean; @@ -165,6 +166,11 @@ public class BeanEntityConverter { } } + Collection<String> externalExperts = question.getExternalExperts(); + if (externalExperts != null && !externalExperts.isEmpty()) { + result.setExternalExperts(Sets.newHashSet(externalExperts)); + } + Set<CoselmarUser> clients = question.getClients(); if (clients != null && !clients.isEmpty()) { for (CoselmarUser client : clients) { diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java index c0aa53d..7d7c27d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/QuestionsWebService.java @@ -580,7 +580,11 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // First Supervisor is the one creating this question questionEntity.addSupervisors(supervisor); - questionEntity.addAllExternalExperts(question.getExternalExperts()); + Set<String> externalExperts = question.getExternalExperts(); + questionEntity.clearExternalExperts(); + if (externalExperts != null && !externalExperts.isEmpty()) { + questionEntity.addAllExternalExperts(externalExperts); + } // Retrieve the clients Set<UserBean> clients = question.getClients(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.