branch develop updated (54c521e -> 5e98e08)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git from 54c521e refs #9206 Add externalUrl management new 5e98e08 code cleanup The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5e98e08c14e6fe3ea6b4c922acd2a80004887fcb Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jun 9 16:20:34 2017 +0200 code cleanup Summary of changes: .../coselmar/beans/DocumentSearchExample.java | 1 - .../coselmar/beans/QuestionSearchExample.java | 2 - .../fr/ifremer/coselmar/beans/SearchExample.java | 1 - .../coselmar/config/CoselmarServicesConfig.java | 12 +++--- .../config/CoselmarServicesConfigOption.java | 4 +- .../fr/ifremer/coselmar/persistence/DaoUtils.java | 4 +- .../coselmar/persistence/FixedH2Dialect.java | 2 - .../persistence/entity/CoselmarUserTopiaDao.java | 8 ++-- .../persistence/entity/DocumentTopiaDao.java | 9 ++--- .../persistence/entity/QuestionTopiaDao.java | 16 ++++---- .../fr/ifremer/FakeCoselmarApplicationContext.java | 1 - .../fr/ifremer/coselmar/beans/AbstractMail.java | 4 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 1 - .../coselmar/beans/DocumentImportModel.java | 3 -- .../ifremer/coselmar/beans/LostPasswordMail.java | 4 +- .../ifremer/coselmar/beans/QuestionSearchBean.java | 1 - .../coselmar/beans/UserAccountCreatedMail.java | 4 +- .../fr/ifremer/coselmar/beans/UserExportModel.java | 2 - .../coselmar/beans/UserPasswordChangedMail.java | 4 +- .../coselmar/converter/BeanEntityConverter.java | 17 +++----- .../ifremer/coselmar/converter/DateConverter.java | 4 +- .../fr/ifremer/coselmar/converter/JsonHelper.java | 6 +-- .../services/CoselmarApplicationContext.java | 8 ++-- .../ifremer/coselmar/services/CoselmarRender.java | 11 +++-- .../services/CoselmarRestApplicationListener.java | 6 +-- .../coselmar/services/CoselmarRestUtil.java | 4 +- .../CoselmarServicesApplicationContext.java | 20 ++++----- .../coselmar/services/CoselmarServicesContext.java | 8 ++-- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 16 ++++---- .../services/DefaultCoselmarServicesContext.java | 18 ++++----- .../services/filter/CoselmarRestRequestFilter.java | 7 ++-- .../filter/CoselmarTopiaTransactionFilter.java | 8 ++-- .../indexation/DocumentsIndexationService.java | 8 ---- .../coselmar/services/indexation/LuceneUtils.java | 6 +-- .../indexation/QuestionsIndexationService.java | 2 - .../CoselmarRestRequestContextInjector.java | 4 +- .../injector/CoselmarServicesInjector.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 10 ++--- .../ifremer/coselmar/services/v1/ErrorAction.java | 4 +- .../coselmar/services/v1/GeneralWebService.java | 1 - .../coselmar/services/v1/HealthService.java | 1 - .../coselmar/services/v1/QuestionsWebService.java | 12 +++--- .../coselmar/services/v1/UsersWebService.java | 47 +++++----------------- .../services/AbstractCoselmarWebServiceTest.java | 8 ++-- .../services/FakeCoselmarServicesContext.java | 8 ++-- .../coselmar/services/QuestionsWebServiceTest.java | 15 ++++--- .../coselmar/services/UsersWebServiceTest.java | 6 +-- .../indexation/DocumentsIndexationServiceTest.java | 10 ++--- .../services/v1/DocumentsWebServiceTest.java | 3 -- 50 files changed, 148 insertions(+), 219 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit 5e98e08c14e6fe3ea6b4c922acd2a80004887fcb Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jun 9 16:20:34 2017 +0200 code cleanup --- .../coselmar/beans/DocumentSearchExample.java | 1 - .../coselmar/beans/QuestionSearchExample.java | 2 - .../fr/ifremer/coselmar/beans/SearchExample.java | 1 - .../coselmar/config/CoselmarServicesConfig.java | 12 +++--- .../config/CoselmarServicesConfigOption.java | 4 +- .../fr/ifremer/coselmar/persistence/DaoUtils.java | 4 +- .../coselmar/persistence/FixedH2Dialect.java | 2 - .../persistence/entity/CoselmarUserTopiaDao.java | 8 ++-- .../persistence/entity/DocumentTopiaDao.java | 9 ++--- .../persistence/entity/QuestionTopiaDao.java | 16 ++++---- .../fr/ifremer/FakeCoselmarApplicationContext.java | 1 - .../fr/ifremer/coselmar/beans/AbstractMail.java | 4 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 1 - .../coselmar/beans/DocumentImportModel.java | 3 -- .../ifremer/coselmar/beans/LostPasswordMail.java | 4 +- .../ifremer/coselmar/beans/QuestionSearchBean.java | 1 - .../coselmar/beans/UserAccountCreatedMail.java | 4 +- .../fr/ifremer/coselmar/beans/UserExportModel.java | 2 - .../coselmar/beans/UserPasswordChangedMail.java | 4 +- .../coselmar/converter/BeanEntityConverter.java | 17 +++----- .../ifremer/coselmar/converter/DateConverter.java | 4 +- .../fr/ifremer/coselmar/converter/JsonHelper.java | 6 +-- .../services/CoselmarApplicationContext.java | 8 ++-- .../ifremer/coselmar/services/CoselmarRender.java | 11 +++-- .../services/CoselmarRestApplicationListener.java | 6 +-- .../coselmar/services/CoselmarRestUtil.java | 4 +- .../CoselmarServicesApplicationContext.java | 20 ++++----- .../coselmar/services/CoselmarServicesContext.java | 8 ++-- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 16 ++++---- .../services/DefaultCoselmarServicesContext.java | 18 ++++----- .../services/filter/CoselmarRestRequestFilter.java | 7 ++-- .../filter/CoselmarTopiaTransactionFilter.java | 8 ++-- .../indexation/DocumentsIndexationService.java | 8 ---- .../coselmar/services/indexation/LuceneUtils.java | 6 +-- .../indexation/QuestionsIndexationService.java | 2 - .../CoselmarRestRequestContextInjector.java | 4 +- .../injector/CoselmarServicesInjector.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 10 ++--- .../ifremer/coselmar/services/v1/ErrorAction.java | 4 +- .../coselmar/services/v1/GeneralWebService.java | 1 - .../coselmar/services/v1/HealthService.java | 1 - .../coselmar/services/v1/QuestionsWebService.java | 12 +++--- .../coselmar/services/v1/UsersWebService.java | 47 +++++----------------- .../services/AbstractCoselmarWebServiceTest.java | 8 ++-- .../services/FakeCoselmarServicesContext.java | 8 ++-- .../coselmar/services/QuestionsWebServiceTest.java | 15 ++++--- .../coselmar/services/UsersWebServiceTest.java | 6 +-- .../indexation/DocumentsIndexationServiceTest.java | 10 ++--- .../services/v1/DocumentsWebServiceTest.java | 3 -- 50 files changed, 148 insertions(+), 219 deletions(-) diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java index 2b8c463..1e9860b 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/DocumentSearchExample.java @@ -22,7 +22,6 @@ package fr.ifremer.coselmar.beans; * #L% */ -import fr.ifremer.coselmar.persistence.SearchRequestBean; import fr.ifremer.coselmar.persistence.entity.Document; import java.util.Date; diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchExample.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchExample.java index 323cfeb..5ff9672 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchExample.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchExample.java @@ -27,9 +27,7 @@ package fr.ifremer.coselmar.beans; import fr.ifremer.coselmar.persistence.entity.CoselmarUser; import fr.ifremer.coselmar.persistence.entity.Question; -import java.io.Serializable; import java.util.Date; -import java.util.List; /** * @author ymartel <martel@codelutin.com> diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java index 376d2e6..7a0cf2e 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/beans/SearchExample.java @@ -22,7 +22,6 @@ package fr.ifremer.coselmar.beans; * #L% */ -import fr.ifremer.coselmar.persistence.entity.Question; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.pagination.PaginationParameter; diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfig.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfig.java index 9cde4b3..aabd633 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfig.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfig.java @@ -24,11 +24,6 @@ package fr.ifremer.coselmar.config; * #L% */ -import java.io.File; -import java.util.List; -import java.util.Map; -import java.util.Properties; - import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; @@ -37,8 +32,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; -import org.nuiton.topia.persistence.TopiaApplicationContext; -import org.nuiton.topia.persistence.TopiaConfiguration; + +import java.io.File; +import java.util.List; +import java.util.Map; +import java.util.Properties; /** * @author ymartel <martel@codelutin.com> diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfigOption.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfigOption.java index 97f6208..5e31da3 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfigOption.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfigOption.java @@ -24,11 +24,11 @@ package fr.ifremer.coselmar.config; * #L% */ -import java.io.File; - import org.nuiton.config.ConfigOptionDef; import org.nuiton.i18n.I18n; +import java.io.File; + /** * Created by martel on 29/10/14. */ diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/DaoUtils.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/DaoUtils.java index 932799f..2a608ac 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/DaoUtils.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/DaoUtils.java @@ -24,10 +24,10 @@ package fr.ifremer.coselmar.persistence; * #L% */ -import java.util.Map; - import org.apache.commons.lang3.StringUtils; +import java.util.Map; + /** * Class containing utilities methods for DAO request. * diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java index cdbd159..279ac65 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/FixedH2Dialect.java @@ -24,8 +24,6 @@ package fr.ifremer.coselmar.persistence; import java.sql.Types; -import java.sql.Types; - /** * Override the H2Dialect to fix detected wrong value * diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java index 8bc7df7..9af0c34 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/CoselmarUserTopiaDao.java @@ -24,16 +24,16 @@ package fr.ifremer.coselmar.persistence.entity; * #L% */ -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import fr.ifremer.coselmar.persistence.DaoUtils; import fr.ifremer.coselmar.persistence.SearchRequestBean; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class CoselmarUserTopiaDao extends AbstractCoselmarUserTopiaDao<CoselmarUser> { /** diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java index 3cdb00e..3fcdcd5 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/DocumentTopiaDao.java @@ -24,17 +24,16 @@ package fr.ifremer.coselmar.persistence.entity; * #L% */ -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import fr.ifremer.coselmar.beans.DocumentSearchExample; import fr.ifremer.coselmar.persistence.DaoUtils; -import fr.ifremer.coselmar.persistence.SearchRequestBean; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class DocumentTopiaDao extends AbstractDocumentTopiaDao<Document> { public PaginationResult<Document> findPaginatedContainingAllKeywords(List<String> keywords, PaginationParameter page) { diff --git a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java index 17bcd17..fd95f15 100644 --- a/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/persistence/entity/QuestionTopiaDao.java @@ -24,14 +24,6 @@ package fr.ifremer.coselmar.persistence.entity; * #L% */ -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import fr.ifremer.coselmar.beans.CloudWord; import fr.ifremer.coselmar.beans.QuestionSearchExample; import fr.ifremer.coselmar.persistence.DaoUtils; @@ -41,6 +33,14 @@ import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class QuestionTopiaDao extends AbstractQuestionTopiaDao<Question> { public PaginationResult<Question> findForExpert(CoselmarUser expert, QuestionSearchExample questionSearchExample, PaginationParameter page) { diff --git a/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java b/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java index b878d0c..63b397e 100644 --- a/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java +++ b/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java @@ -24,7 +24,6 @@ package fr.ifremer; * #L% */ -import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; import org.apache.commons.logging.Log; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/AbstractMail.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/AbstractMail.java index 7d96ab0..c7ce0cb 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/AbstractMail.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/AbstractMail.java @@ -24,11 +24,11 @@ package fr.ifremer.coselmar.beans; * #L% */ -import java.util.Locale; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java index 80d9425..0c26bbb 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentBean.java @@ -28,7 +28,6 @@ import java.io.Serializable; import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.List; import java.util.Set; /** diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentImportModel.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentImportModel.java index b19a77f..d01c456 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentImportModel.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/DocumentImportModel.java @@ -1,14 +1,11 @@ package fr.ifremer.coselmar.beans; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.nuiton.csv.Common; import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Collection; import java.util.Set; /** diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LostPasswordMail.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LostPasswordMail.java index 5665653..ed8b743 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LostPasswordMail.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LostPasswordMail.java @@ -24,12 +24,12 @@ package fr.ifremer.coselmar.beans; * #L% */ -import java.util.Locale; - import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; import org.nuiton.i18n.I18n; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java index eab6d9a..e7591ea 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionSearchBean.java @@ -24,7 +24,6 @@ package fr.ifremer.coselmar.beans; * #L% */ -import java.util.Collection; import java.util.Date; import java.util.List; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserAccountCreatedMail.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserAccountCreatedMail.java index a810c30..80fb9d6 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserAccountCreatedMail.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserAccountCreatedMail.java @@ -24,12 +24,12 @@ package fr.ifremer.coselmar.beans; * #L% */ -import java.util.Locale; - import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; import org.nuiton.i18n.I18n; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java index 8600cb4..90a7442 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserExportModel.java @@ -23,10 +23,8 @@ package fr.ifremer.coselmar.beans; */ import org.apache.commons.lang3.StringUtils; -import org.nuiton.csv.Common; import org.nuiton.csv.ValueFormatter; import org.nuiton.csv.ext.AbstractExportModel; -import org.nuiton.util.DateUtil; import static org.nuiton.i18n.I18n.t; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserPasswordChangedMail.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserPasswordChangedMail.java index 73a0ce9..c350992 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserPasswordChangedMail.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/UserPasswordChangedMail.java @@ -24,12 +24,12 @@ package fr.ifremer.coselmar.beans; * #L% */ -import java.util.Locale; - import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; import org.nuiton.i18n.I18n; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ 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 b8d8e2a..d36354b 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 @@ -24,17 +24,8 @@ package fr.ifremer.coselmar.converter; * #L% */ -import java.util.Collection; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.google.common.primitives.Booleans; import fr.ifremer.coselmar.beans.DocumentBean; import fr.ifremer.coselmar.beans.LinkBean; import fr.ifremer.coselmar.beans.QuestionBean; @@ -54,6 +45,12 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaIdFactory; +import java.util.Collection; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Set; + /** * @author ymartel <martel@codelutin.com> */ @@ -222,7 +219,6 @@ public class BeanEntityConverter { Collection<Document> closingDocuments = question.getClosingDocuments(); if (closingDocuments != null && !closingDocuments.isEmpty()) { for (Document relatedDocument : closingDocuments) { - String lightId = idFactory.getRandomPart(relatedDocument.getTopiaId()); DocumentBean documentBean = toBean(idFactory, relatedDocument); result.addClosingDocument(documentBean); } @@ -278,7 +274,6 @@ public class BeanEntityConverter { Collection<Document> closingDocuments = question.getClosingDocuments(); if (closingDocuments != null && !closingDocuments.isEmpty()) { for (Document relatedDocument : closingDocuments) { - String lightId = idFactory.getRandomPart(relatedDocument.getTopiaId()); DocumentBean documentBean = toBean(idFactory, relatedDocument); result.addClosingDocument(documentBean); } diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java index df2e26b..6b30f99 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/DateConverter.java @@ -24,10 +24,10 @@ package fr.ifremer.coselmar.converter; * #L% */ -import java.util.Date; - import org.apache.commons.beanutils.converters.AbstractConverter; +import java.util.Date; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java index 7e21213..9548a26 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/JsonHelper.java @@ -24,9 +24,6 @@ package fr.ifremer.coselmar.converter; * #L% */ -import java.lang.reflect.Type; -import java.util.Date; - import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; @@ -40,6 +37,9 @@ import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; +import java.lang.reflect.Type; +import java.util.Date; + public class JsonHelper { private final Gson gson; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java index d448b55..b27fd27 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarApplicationContext.java @@ -24,15 +24,15 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.io.Closeable; -import java.util.Locale; - +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.indexation.LuceneUtils; +import java.io.Closeable; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java index 8f25af2..8b9337f 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRender.java @@ -24,18 +24,17 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; - import fr.ifremer.coselmar.converter.JsonHelper; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.mapping.Mapping; import org.debux.webmotion.server.render.Render; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java index 7c02356..c6396e5 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestApplicationListener.java @@ -24,9 +24,6 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.util.Date; -import java.util.Set; - import com.google.common.collect.Sets; import fr.ifremer.coselmar.beans.DocumentBean; import fr.ifremer.coselmar.beans.DocumentSearchBean; @@ -45,6 +42,9 @@ import org.debux.webmotion.server.WebMotionServerListener; import org.debux.webmotion.server.call.ServerContext; import org.debux.webmotion.server.mapping.Mapping; +import java.util.Date; +import java.util.Set; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java index ad14986..3c6bfa7 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarRestUtil.java @@ -24,11 +24,11 @@ package fr.ifremer.coselmar.services; * #L% */ -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.debux.webmotion.server.call.HttpContext; +import javax.servlet.http.HttpServletResponse; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java index 1068556..e1b414f 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java @@ -24,29 +24,25 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.io.File; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicBoolean; - -import javax.servlet.ServletContext; - import com.google.common.base.Preconditions; +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.indexation.LuceneUtils; import fr.ifremer.coselmar.services.v1.InitialisationService; import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.i18n.init.I18nInitializer; -import org.nuiton.topia.persistence.TopiaConfigurationBuilder; + +import javax.servlet.ServletContext; +import java.io.File; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; import static org.apache.commons.logging.LogFactory.getLog; @@ -226,7 +222,7 @@ public class CoselmarServicesApplicationContext implements CoselmarApplicationCo // use generate log config file PropertyConfigurator.configure(log4jConfigurationFileAbsolutePath); - log = LogFactory.getLog(CoselmarServicesApplicationContext.class); + log = getLog(CoselmarServicesApplicationContext.class); } else { if (log.isWarnEnabled()) { diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java index d614ec3..e6f949d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesContext.java @@ -24,14 +24,14 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.util.Date; -import java.util.Locale; - +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; -import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.indexation.LuceneUtils; +import java.util.Date; +import java.util.Locale; + /** * Created by martel on 30/10/14. */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarSimpleServiceSupport.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarSimpleServiceSupport.java index 559d246..93c4d32 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarSimpleServiceSupport.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarSimpleServiceSupport.java @@ -24,9 +24,9 @@ package fr.ifremer.coselmar.services; * #L% */ +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.entity.CoselmarUserTopiaDao; -import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.indexation.LuceneUtils; /** diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java index 4c85fc7..a63266a 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarWebServiceSupport.java @@ -24,14 +24,6 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.io.IOException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.SignatureException; -import java.util.Date; -import java.util.Locale; -import java.util.Map; - import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.JWTVerifyException; import fr.ifremer.coselmar.beans.UserWebToken; @@ -52,6 +44,14 @@ import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.call.HttpContext; import org.nuiton.topia.persistence.TopiaNoResultException; +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.SignatureException; +import java.util.Date; +import java.util.Locale; +import java.util.Map; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java index e1e4719..b48a74f 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/DefaultCoselmarServicesContext.java @@ -24,23 +24,23 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.util.Date; -import java.util.Locale; - +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; -import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.indexation.LuceneUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.Date; +import java.util.Locale; + import static org.apache.commons.logging.LogFactory.getLog; /** diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java index 9836abd..3c75372 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarRestRequestFilter.java @@ -24,10 +24,6 @@ package fr.ifremer.coselmar.services.filter; * #L% */ -import java.util.Locale; - -import javax.servlet.http.HttpServletResponse; - import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.services.CoselmarRestRequestContext; import fr.ifremer.coselmar.services.CoselmarRestUtil; @@ -41,6 +37,9 @@ import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.render.Render; import org.debux.webmotion.server.render.RenderStatus; +import javax.servlet.http.HttpServletResponse; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java index c303c28..5ba8f28 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/filter/CoselmarTopiaTransactionFilter.java @@ -24,10 +24,6 @@ package fr.ifremer.coselmar.services.filter; * #L% */ -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; - import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; import fr.ifremer.coselmar.services.CoselmarServicesApplicationContext; @@ -36,6 +32,10 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.web.filter.TypedTopiaTransactionFilter; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java index 1e49e96..ce4770c 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationService.java @@ -27,8 +27,6 @@ package fr.ifremer.coselmar.services.indexation; import fr.ifremer.coselmar.beans.DocumentBean; import fr.ifremer.coselmar.services.CoselmarSimpleServiceSupport; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.StringField; @@ -47,10 +45,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.util.BytesRef; -import org.apache.tika.exception.TikaException; -import org.apache.tika.mime.MimeType; -import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -74,15 +69,12 @@ import java.util.Set; */ public class DocumentsIndexationService extends CoselmarSimpleServiceSupport { - private static final Log log = LogFactory.getLog(DocumentsIndexationService.class); - protected static final String DOCUMENT_ID_INDEX_PROPERTY = "documentId"; protected static final String DOCUMENT_NAME_INDEX_PROPERTY = "documentName"; protected static final String DOCUMENT_AUTHORS_INDEX_PROPERTY = "documentAuthors"; protected static final String DOCUMENT_SUMMARY_INDEX_PROPERTY = "documentSummary"; protected static final String DOCUMENT_KEYWORD_INDEX_PROPERTY = "documentKeyword"; protected static final String DOCUMENT_NAME_CLOUD_TAG_PROPERTY = "documentCloudTagName"; - protected static final String DOCUMENT_SUMMARY_CLOUD_TAG_PROPERTY = "documentCloudTagSummary"; protected static final String DOCUMENT_KEYWORD_CLOUD_TAG_PROPERTY = "documentCloudTagKeyword"; protected static final String DOCUMENT_FILE_CONTENT_INDEX_PROPERTY = "documentFileContent"; protected static final String DOCUMENT_TYPE = "documentindextype"; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java index 6e6b0ef..0c537c6 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/LuceneUtils.java @@ -24,9 +24,6 @@ package fr.ifremer.coselmar.services.indexation; * #L% */ -import java.io.File; -import java.io.IOException; - import fr.ifremer.coselmar.config.CoselmarServicesConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,6 +38,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.NIOFSDirectory; import org.apache.tika.Tika; +import java.io.File; +import java.io.IOException; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java index fab643b..98d93b0 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/indexation/QuestionsIndexationService.java @@ -30,12 +30,10 @@ import fr.ifremer.coselmar.services.CoselmarSimpleServiceSupport; import org.apache.commons.lang3.StringUtils; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.FieldType; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.Fields; -import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java index 811c62d..a568195 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarRestRequestContextInjector.java @@ -24,14 +24,14 @@ package fr.ifremer.coselmar.services.injector; * #L% */ -import java.lang.reflect.Type; - import fr.ifremer.coselmar.services.CoselmarRestRequestContext; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; +import java.lang.reflect.Type; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java index 278814f..5086302 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/injector/CoselmarServicesInjector.java @@ -24,8 +24,6 @@ package fr.ifremer.coselmar.services.injector; * #L% */ -import java.lang.reflect.Type; - import fr.ifremer.coselmar.services.CoselmarRestRequestContext; import fr.ifremer.coselmar.services.CoselmarService; import org.debux.webmotion.server.call.Call; @@ -33,6 +31,8 @@ import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; +import java.lang.reflect.Type; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java index 939f38e..46c6237 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/DocumentsWebService.java @@ -202,7 +202,7 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { } if (searchBean.getDepositBeforeDate() != null) { - Date depositBeforeDate = DateUtil.getEndOfDay((searchBean.getDepositBeforeDate())); + Date depositBeforeDate = DateUtil.getEndOfDay(searchBean.getDepositBeforeDate()); searchExample.setDepositBeforeDate(depositBeforeDate); } @@ -212,7 +212,7 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { } if (searchBean.getPublicationBeforeDate() != null) { - Date publicationBeforeDate = DateUtil.getEndOfDay((searchBean.getPublicationBeforeDate())); + Date publicationBeforeDate = DateUtil.getEndOfDay(searchBean.getPublicationBeforeDate()); searchExample.setPublicationBeforeDate(publicationBeforeDate); } } @@ -297,7 +297,7 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { } if (searchBean.getDepositBeforeDate() != null) { - Date depositBeforeDate = DateUtil.getEndOfDay((searchBean.getDepositBeforeDate())); + Date depositBeforeDate = DateUtil.getEndOfDay(searchBean.getDepositBeforeDate()); searchExample.setDepositBeforeDate(depositBeforeDate); } @@ -307,7 +307,7 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { } if (searchBean.getPublicationBeforeDate() != null) { - Date publicationBeforeDate = DateUtil.getEndOfDay((searchBean.getPublicationBeforeDate())); + Date publicationBeforeDate = DateUtil.getEndOfDay(searchBean.getPublicationBeforeDate()); searchExample.setPublicationBeforeDate(publicationBeforeDate); } } @@ -971,7 +971,7 @@ public class DocumentsWebService extends CoselmarWebServiceSupport { // File should be a Zip ZipFile zipFile; try { - zipFile = new ZipFile(file);; + zipFile = new ZipFile(file); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("error during ZipFile transfer", e); diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java index 24d34e6..45d1c49 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/ErrorAction.java @@ -24,13 +24,13 @@ package fr.ifremer.coselmar.services.v1; * #L% */ -import javax.servlet.http.HttpServletResponse; - import fr.ifremer.coselmar.services.CoselmarRestUtil; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.render.Render; +import javax.servlet.http.HttpServletResponse; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/GeneralWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/GeneralWebService.java index cc1eaf4..090c15b 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/GeneralWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/GeneralWebService.java @@ -30,7 +30,6 @@ import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import fr.ifremer.coselmar.persistence.entity.CoselmarUserRole; import fr.ifremer.coselmar.services.CoselmarWebServiceSupport; import fr.ifremer.coselmar.services.indexation.TransverseIndexationService; -import fr.ifremer.coselmar.services.indexation.QuestionsIndexationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.lucene.queryparser.classic.ParseException; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java index 791d730..b3faad2 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java @@ -26,7 +26,6 @@ package fr.ifremer.coselmar.services.v1; import fr.ifremer.coselmar.beans.HealthBean; import fr.ifremer.coselmar.beans.QuestionSearchBean; -import fr.ifremer.coselmar.beans.QuestionSearchExample; import fr.ifremer.coselmar.persistence.entity.Privacy; import fr.ifremer.coselmar.services.CoselmarWebServiceSupport; import fr.ifremer.coselmar.services.indexation.QuestionsIndexationService; 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 6970d98..55ecfe4 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 @@ -456,7 +456,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // Client is not allowed to see documents if (CoselmarUserRole.CLIENT == currentUser.getRole() - || (CoselmarUserRole.SUPERVISOR != currentUser.getRole() && question.getClients() != null && question.getClients().contains(currentUser))) { + || CoselmarUserRole.SUPERVISOR != currentUser.getRole() && question.getClients() != null && question.getClients().contains(currentUser)) { // clients does not have to see all documents result.setRelatedDocuments(null); @@ -1073,7 +1073,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { // Check authentication String authorization = getContext().getHeader("Authorization"); - CoselmarUser user = checkUserAuthentication(authorization); + checkUserAuthentication(authorization); // Retrieve Question String fullQuestionId = getFullIdFromShort(Question.class, questionId); @@ -1338,7 +1338,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { } if (searchBean.getSubmissionBeforeDate() != null) { - Date submissionBeforeDate = DateUtil.getEndOfDay((searchBean.getSubmissionBeforeDate())); + Date submissionBeforeDate = DateUtil.getEndOfDay(searchBean.getSubmissionBeforeDate()); searchExample.setSubmissionBeforeDate(submissionBeforeDate); } @@ -1348,7 +1348,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { } if (searchBean.getDeadlineBeforeDate() != null) { - Date deadlineBeforeDate = DateUtil.getEndOfDay((searchBean.getDeadlineBeforeDate())); + Date deadlineBeforeDate = DateUtil.getEndOfDay(searchBean.getDeadlineBeforeDate()); searchExample.setDeadlineBeforeDate(deadlineBeforeDate); } @@ -1524,7 +1524,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { } Date submissionDate = parent.getSubmissionDate(); if (submissionDate != null) { - ancestor.setSubmissionDate((new Date (submissionDate.getTime()))); + ancestor.setSubmissionDate(new Date (submissionDate.getTime())); } ancestor.setType(parent.getType()); // Get ancestors of this parent @@ -1567,7 +1567,7 @@ public class QuestionsWebService extends CoselmarWebServiceSupport { } Date submissionDate = child.getSubmissionDate(); if (submissionDate != null) { - descendant.setSubmissionDate((new Date (submissionDate.getTime()))); + descendant.setSubmissionDate(new Date (submissionDate.getTime())); } descendant.setType(child.getType()); // Get descendants of this child diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java index 31c36df..5d1613d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/UsersWebService.java @@ -24,13 +24,6 @@ package fr.ifremer.coselmar.services.v1; * #L% */ -import java.io.StringWriter; -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; - import com.auth0.jwt.Algorithm; import com.auth0.jwt.JWTSigner; import com.github.mustachejava.DefaultMustacheFactory; @@ -40,7 +33,6 @@ import com.github.mustachejava.MustacheFactory; import com.google.common.base.Preconditions; import fr.ifremer.coselmar.beans.AbstractMail; import fr.ifremer.coselmar.beans.LostPasswordMail; -import fr.ifremer.coselmar.beans.SearchExample; import fr.ifremer.coselmar.beans.UserAccountCreatedMail; import fr.ifremer.coselmar.beans.UserBean; import fr.ifremer.coselmar.beans.UserExportModel; @@ -71,6 +63,13 @@ import org.nuiton.util.StringUtil; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import java.io.StringWriter; +import java.security.InvalidParameterException; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import static org.apache.commons.logging.LogFactory.getLog; /** @@ -84,33 +83,7 @@ public class UsersWebService extends CoselmarWebServiceSupport { // Check authentication String authorization = getContext().getHeader("Authorization"); - UserWebToken userWebToken = checkAuthentication(authorization); - - // Who is allowed here ? Admin and user himself and Supervisor if user wanted is client - boolean isAdmin = StringUtils.equals(userWebToken.getRole(), CoselmarUserRole.ADMIN.name()); - boolean isSupervisor = StringUtils.equals(userWebToken.getRole(), CoselmarUserRole.SUPERVISOR.name()); - boolean isHimself = StringUtils.equals(userWebToken.getUserId(), userId); -// -// if (!isAdmin && !isSupervisor && !isHimself) { -// if (log.isDebugEnabled()) { -// String message = String.format("A non admin user try to see account details with shortId '%s'", userId); -// log.debug(message); -// } -// throw new UnauthorizedException("Not allowed to see user details"); -// } - - // reconstitute full id - String fullId = CoselmarUser.class.getCanonicalName() + getPersistenceContext().getTopiaIdFactory().getSeparator() + userId; - - CoselmarUser user = getCoselmarUserDao().forTopiaIdEquals(fullId).findUnique(); - -// if (isSupervisor && user.getRole() != CoselmarUserRole.CLIENT && !isHimself) { -// if (log.isDebugEnabled()) { -// String message = String.format("A supervisor user try to see non client account details with shortId '%s'", userId); -// log.debug(message); -// } -// throw new UnauthorizedException("Not allowed to see user details"); -// } + CoselmarUser user = checkUserAuthentication(authorization); UserBean userBean = BeanEntityConverter.toBean(userId, user); return userBean; @@ -227,8 +200,8 @@ public class UsersWebService extends CoselmarWebServiceSupport { // Who is allowed here ? Admin and Superviseur if (!StringUtils.equals(userWebToken.getRole(), CoselmarUserRole.ADMIN.name()) - && (StringUtils.equals(userWebToken.getRole(), CoselmarUserRole.SUPERVISOR.name()) - && !StringUtils.equals(user.getRole(), CoselmarUserRole.CLIENT.name())) + && StringUtils.equals(userWebToken.getRole(), CoselmarUserRole.SUPERVISOR.name()) + && !StringUtils.equals(user.getRole(), CoselmarUserRole.CLIENT.name()) ) { if (log.isDebugEnabled()) { String message = String.format("A non admin, non supervisor user is trying to create user"); diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/AbstractCoselmarWebServiceTest.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/AbstractCoselmarWebServiceTest.java index 3c1e540..30c383c 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/AbstractCoselmarWebServiceTest.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/AbstractCoselmarWebServiceTest.java @@ -24,10 +24,6 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.io.File; -import java.io.IOException; -import java.util.Locale; - import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import org.apache.commons.logging.Log; import org.debux.webmotion.unittest.WebMotionTest; @@ -36,6 +32,10 @@ import org.junit.Before; import org.junit.Rule; import org.nuiton.util.DateUtil; +import java.io.File; +import java.io.IOException; +import java.util.Locale; + import static org.apache.commons.logging.LogFactory.getLog; /** diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarServicesContext.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarServicesContext.java index 22df005..da966e7 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarServicesContext.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarServicesContext.java @@ -24,17 +24,17 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.util.Date; -import java.util.Locale; - import com.google.common.base.Preconditions; +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.indexation.LuceneUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Date; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/QuestionsWebServiceTest.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/QuestionsWebServiceTest.java index 52a562d..87492b1 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/QuestionsWebServiceTest.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/QuestionsWebServiceTest.java @@ -24,15 +24,7 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.Map; - import com.auth0.jwt.JWTVerifier; -import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import fr.ifremer.coselmar.beans.QuestionBean; @@ -44,6 +36,13 @@ import org.apache.http.client.fluent.Response; import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Map; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/UsersWebServiceTest.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/UsersWebServiceTest.java index aad8af9..39a84e4 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/UsersWebServiceTest.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/UsersWebServiceTest.java @@ -24,9 +24,6 @@ package fr.ifremer.coselmar.services; * #L% */ -import java.util.Locale; -import java.util.Map; - import com.auth0.jwt.JWTVerifier; import com.google.gson.Gson; import org.apache.http.HttpResponse; @@ -36,6 +33,9 @@ import org.apache.http.client.fluent.Response; import org.junit.Assert; import org.junit.Test; +import java.util.Locale; +import java.util.Map; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java index acd53aa..8fba10f 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/indexation/DocumentsIndexationServiceTest.java @@ -24,11 +24,6 @@ package fr.ifremer.coselmar.services.indexation; * #L% */ -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Locale; - import com.google.common.collect.Lists; import fr.ifremer.coselmar.beans.DocumentBean; import fr.ifremer.coselmar.persistence.entity.Privacy; @@ -39,6 +34,11 @@ import org.junit.After; import org.junit.Assert; import org.junit.Test; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Locale; + /** * @author ymartel <martel@codelutin.com> */ diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/v1/DocumentsWebServiceTest.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/v1/DocumentsWebServiceTest.java index 04ea309..c3f8de8 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/v1/DocumentsWebServiceTest.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/v1/DocumentsWebServiceTest.java @@ -26,7 +26,6 @@ package fr.ifremer.coselmar.services.v1; import fr.ifremer.coselmar.beans.MassiveDocumentsImportResult; import fr.ifremer.coselmar.persistence.entity.CoselmarUser; -import fr.ifremer.coselmar.persistence.entity.CoselmarUserImpl; import fr.ifremer.coselmar.persistence.entity.CoselmarUserTopiaDao; import fr.ifremer.coselmar.persistence.entity.Document; import fr.ifremer.coselmar.persistence.entity.DocumentTopiaDao; @@ -37,8 +36,6 @@ import org.junit.Test; import java.io.File; import java.io.InputStream; -import java.net.URL; -import java.nio.file.CopyOption; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm