branch documentDeleteTopiaError created (now 088e487)
This is an automated email from the git hooks/post-receive script. New change to branch documentDeleteTopiaError in repository coselmar. See http://git.codelutin.com/coselmar.git at 088e487 add an unit test to highlight error with topia during deletion This branch includes the following new commits: new 088e487 add an unit test to highlight error with topia during deletion 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 088e4874c23771376a4cfccf39781a2dae91bef3 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 13 17:57:51 2015 +0100 add an unit test to highlight error with topia during deletion -- 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 documentDeleteTopiaError in repository coselmar. See http://git.codelutin.com/coselmar.git commit 088e4874c23771376a4cfccf39781a2dae91bef3 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Jan 13 17:57:51 2015 +0100 add an unit test to highlight error with topia during deletion --- coselmar-persistence/pom.xml | 23 ++++ .../coselmar}/config/CoselmarServicesConfig.java | 4 +- .../config/CoselmarServicesConfigOption.java | 2 +- .../exceptions}/CoselmarTechnicalException.java | 2 +- .../i18n/coselmar-persistence_en_GB.properties | 2 + .../i18n/coselmar-persistence_fr_FR.properties | 2 + .../java/fr/ifremer/AbstractCoselmarDaoTest.java | 23 +--- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 73 +++++++++++ .../ifremer}/FakeCoselmarApplicationContext.java | 141 +++------------------ .../resources/coselmar-persistence-test.properties | 31 +++++ coselmar-rest/pom.xml | 4 - .../services/CoselmarApplicationContext.java | 2 +- .../CoselmarServicesApplicationContext.java | 2 +- .../coselmar/services/CoselmarServicesContext.java | 2 +- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 3 +- .../services/DefaultCoselmarServicesContext.java | 3 +- .../coselmar/services/indexation/LuceneUtils.java | 2 +- .../coselmar/services/v1/AdminWebService.java | 2 +- .../coselmar/services/v1/DocumentsWebService.java | 2 +- .../coselmar/services/v1/UsersWebService.java | 4 +- coselmar-rest/src/main/resources/mapping | 2 +- .../services/FakeCoselmarApplicationContext.java | 4 +- .../services/FakeCoselmarServicesContext.java | 2 +- 24 files changed, 175 insertions(+), 164 deletions(-) diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d5094fe..a5e50a3 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -50,6 +50,11 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> <dependency> <groupId>org.nuiton.topia</groupId> @@ -61,6 +66,24 @@ <artifactId>hibernate-core</artifactId> </dependency> + <!-- Tests --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-junit</artifactId> + </dependency> + + <!-- databases --> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfig.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfig.java similarity index 98% rename from coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfig.java rename to coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfig.java index 81538ed..4b597b5 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfig.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfig.java @@ -1,4 +1,4 @@ -package fr.ifremer.coselmar.services.config; +package fr.ifremer.coselmar.config; /* * #%L @@ -31,7 +31,7 @@ import java.util.Properties; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.coselmar.services.CoselmarTechnicalException; +import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfigOption.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfigOption.java similarity index 98% rename from coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfigOption.java rename to coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfigOption.java index c729e6b..ca0808a 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/config/CoselmarServicesConfigOption.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/config/CoselmarServicesConfigOption.java @@ -1,4 +1,4 @@ -package fr.ifremer.coselmar.services.config; +package fr.ifremer.coselmar.config; /* * #%L diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/exceptions/CoselmarTechnicalException.java similarity index 97% copy from coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java copy to coselmar-persistence/src/main/java/fr/ifremer/coselmar/exceptions/CoselmarTechnicalException.java index f74b647..b49d3af 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java +++ b/coselmar-persistence/src/main/java/fr/ifremer/coselmar/exceptions/CoselmarTechnicalException.java @@ -1,4 +1,4 @@ -package fr.ifremer.coselmar.services; +package fr.ifremer.coselmar.exceptions; /* * #%L diff --git a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties index e69de29..4710e08 100644 --- a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties +++ b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_en_GB.properties @@ -0,0 +1,2 @@ +coselmar.configuration.data.directory= +coselmar.configuration.index.directory= diff --git a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties index e69de29..4710e08 100644 --- a/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties +++ b/coselmar-persistence/src/main/resources/i18n/coselmar-persistence_fr_FR.properties @@ -0,0 +1,2 @@ +coselmar.configuration.data.directory= +coselmar.configuration.index.directory= diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java b/coselmar-persistence/src/test/java/fr/ifremer/AbstractCoselmarDaoTest.java similarity index 63% rename from coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java rename to coselmar-persistence/src/test/java/fr/ifremer/AbstractCoselmarDaoTest.java index f74b647..beb3c1e 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarTechnicalException.java +++ b/coselmar-persistence/src/test/java/fr/ifremer/AbstractCoselmarDaoTest.java @@ -1,4 +1,4 @@ -package fr.ifremer.coselmar.services; +package fr.ifremer; /* * #%L @@ -24,25 +24,14 @@ package fr.ifremer.coselmar.services; * #L% */ +import org.junit.Rule; + /** * @author ymartel <martel@codelutin.com> */ -public class CoselmarTechnicalException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - public CoselmarTechnicalException() { - } - - public CoselmarTechnicalException(String message) { - super(message); - } +public class AbstractCoselmarDaoTest { - public CoselmarTechnicalException(String message, Throwable cause) { - super(message, cause); - } + @Rule + public final FakeCoselmarApplicationContext application = new FakeCoselmarApplicationContext("coselmar-persistence-test.properties"); - public CoselmarTechnicalException(Throwable cause) { - super(cause); - } } diff --git a/coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java b/coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java new file mode 100644 index 0000000..da496fe --- /dev/null +++ b/coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java @@ -0,0 +1,73 @@ +package fr.ifremer; + +import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; +import fr.ifremer.coselmar.persistence.entity.Document; +import fr.ifremer.coselmar.persistence.entity.DocumentTopiaDao; +import fr.ifremer.coselmar.persistence.entity.Privacy; +import fr.ifremer.coselmar.persistence.entity.Question; +import fr.ifremer.coselmar.persistence.entity.QuestionTopiaDao; +import fr.ifremer.coselmar.persistence.entity.Status; +import org.junit.Assert; +import org.junit.Test; + +/** + * @author ymartel <martel@codelutin.com> + */ +public class DocumentDaoTest extends AbstractCoselmarDaoTest { + + @Test + public void testQuestionDocumentDelete() throws Exception { + + CoselmarTopiaPersistenceContext persistenceContext = application.newPersistenceContext(); + DocumentTopiaDao documentDao = persistenceContext.getDocumentDao(); + + // Create two basic document + Document firstDocument = documentDao.create(); + firstDocument.setName("My Awesome Test"); + firstDocument.setPrivacy(Privacy.PUBLIC); + firstDocument.setSummary("Oh really, a summary?"); + + Document secondDocument = documentDao.create(); + secondDocument.setName("My Awesome Test"); + secondDocument.setPrivacy(Privacy.PUBLIC); + secondDocument.setSummary("Oh really, a summary?"); + + persistenceContext.commit(); + + // Create a question with same persistence context + Question firstQuestion = persistenceContext.getQuestionDao().create(); + firstQuestion.setTitle("Is this a question?"); + firstQuestion.setStatus(Status.OPEN); + firstQuestion.setSummary("We have to ask some question"); + firstQuestion.setPrivacy(Privacy.PUBLIC); + firstQuestion.addRelatedDocuments(firstDocument); + + persistenceContext.commit(); + + // Now, try to delete the first document + documentDao.delete(firstDocument); + persistenceContext.commit(); // Here we have no error + + + // Create an other question linking the document thanks to an other persistance context + CoselmarTopiaPersistenceContext secondPersistenceContext = application.newPersistenceContext(); + QuestionTopiaDao questionDao = secondPersistenceContext.getQuestionDao(); + + Question secondQuestion = questionDao.create(); + secondQuestion.setTitle("Is this a question?"); + secondQuestion.setStatus(Status.OPEN); + secondQuestion.setSummary("We have to ask some question"); + secondQuestion.setPrivacy(Privacy.PUBLIC); + secondQuestion.addRelatedDocuments(secondDocument); + + secondPersistenceContext.commit(); + + // Now, try to delete the document + documentDao.delete(secondDocument); // Here we have error + persistenceContext.commit(); + + Question reloadQuestion = questionDao.forTopiaIdEquals(secondQuestion.getTopiaId()).findAny(); + Assert.assertTrue(reloadQuestion.getRelatedDocuments().isEmpty()); + } + +} diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java b/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java similarity index 56% copy from coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java copy to coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java index b619a03..3086fc0 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java +++ b/coselmar-persistence/src/test/java/fr/ifremer/FakeCoselmarApplicationContext.java @@ -1,4 +1,4 @@ -package fr.ifremer.coselmar.services; +package fr.ifremer; /* * #%L @@ -25,27 +25,19 @@ package fr.ifremer.coselmar.services; */ import java.io.File; -import java.io.IOException; -import java.net.ServerSocket; import java.util.LinkedList; import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Properties; -import java.util.concurrent.atomic.AtomicInteger; -import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; +import fr.ifremer.coselmar.config.CoselmarServicesConfig; +import fr.ifremer.coselmar.config.CoselmarServicesConfigOption; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfigOption; -import fr.ifremer.coselmar.services.indexation.LuceneUtils; -import fr.ifremer.coselmar.services.v1.InitialisationService; import org.apache.commons.logging.Log; import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.nuiton.topia.junit.ConfigurationHelper; -import org.nuiton.util.DateUtil; import static org.apache.commons.logging.LogFactory.getLog; @@ -53,12 +45,10 @@ import static org.apache.commons.logging.LogFactory.getLog; /** * @author ymartel <martel@codelutin.com> */ -public class FakeCoselmarApplicationContext extends TestWatcher implements CoselmarApplicationContext { +public class FakeCoselmarApplicationContext extends TestWatcher { private static Log log = getLog(FakeCoselmarApplicationContext.class); - protected static AtomicInteger portNumberCounter = new AtomicInteger(9999); - protected File testBasedir; protected List<CoselmarTopiaPersistenceContext> openedTransactions = new LinkedList<>(); @@ -67,12 +57,8 @@ public class FakeCoselmarApplicationContext extends TestWatcher implements Cosel protected CoselmarServicesConfig configuration; - protected LuceneUtils luceneUtils; - protected String methodName; - protected int currentPortNumber; - protected final String configurationPath; public FakeCoselmarApplicationContext(String configurationPath) { @@ -82,11 +68,6 @@ public class FakeCoselmarApplicationContext extends TestWatcher implements Cosel @Override protected void starting(Description description) { - // get an available port - currentPortNumber = getAvailablePort(); - if (log.isDebugEnabled()) { - log.debug("Using port: " + currentPortNumber); - } methodName = description.getMethodName(); @@ -109,7 +90,6 @@ public class FakeCoselmarApplicationContext extends TestWatcher implements Cosel close(); } - @Override public void init() { // --- create configuration --- // @@ -124,18 +104,8 @@ public class FakeCoselmarApplicationContext extends TestWatcher implements Cosel Map<String, String> topiaProperties = configuration.getTopiaProperties(); applicationContext = new CoselmarTopiaApplicationContext(topiaProperties); - luceneUtils = new LuceneUtils(configuration); - - {//Init some users - CoselmarTopiaPersistenceContext persistenceContext = newPersistenceContext(); - CoselmarServicesContext serviceContext = newServiceContext(persistenceContext, Locale.FRANCE); - serviceContext.newService(InitialisationService.class).createDefaultUsers(); - persistenceContext.close(); - } - } - @Override public void close() { if (applicationContext != null && !applicationContext.isClosed()) { @@ -161,32 +131,16 @@ public class FakeCoselmarApplicationContext extends TestWatcher implements Cosel applicationContext.close(); } - - if (luceneUtils != null ) { - - if (log.isInfoEnabled()) { - log.info("Close Lucene Reader"); - } - luceneUtils.closeWriter(); - } } - @Override public CoselmarTopiaApplicationContext getTopiaApplicationContext() { return applicationContext; } - - @Override - public CoselmarServicesConfig getApplicationConfig() { - return configuration; - } - - @Override - public LuceneUtils getLuceneUtils() { - return luceneUtils; - } - - @Override +// +// public CoselmarServicesConfig getApplicationConfig() { +// return configuration; +// } +// public CoselmarTopiaPersistenceContext newPersistenceContext() { CoselmarTopiaPersistenceContext persistenceContext; @@ -202,74 +156,13 @@ public class FakeCoselmarApplicationContext extends TestWatcher implements Cosel return persistenceContext; } - - @Override - public FakeCoselmarServicesContext newServiceContext(CoselmarPersistenceContext persistenceContext, Locale locale) { - - FakeCoselmarServicesContext serviceContext = FakeCoselmarServicesContext.newServiceContext( - DateUtil.createDate(1, 1, 2014), - Locale.FRANCE, - getApplicationConfig(), - getTopiaApplicationContext(), - newPersistenceContext(), - getLuceneUtils()); - return serviceContext; - - } - - public File getTestBasedir() { - return testBasedir; - } - - public int getPort() { - return currentPortNumber; - } - - public String getMethodName() { - return methodName; - } - - protected int getAvailablePort() { - - int port = portNumberCounter.getAndIncrement(); - - boolean portTaken = false; - ServerSocket socket = null; - - try { - - socket = new ServerSocket(port); - - } catch (IOException e) { - - portTaken = true; - - } finally { - - if (socket != null) - - try { - - socket.close(); - - } catch (IOException e) { - - if (log.isDebugEnabled()) { - log.debug("Already used port: " + port); - } - - } - - } - - if (portTaken) { - - port = getAvailablePort(); - - } - - return port; - - } +// +// public File getTestBasedir() { +// return testBasedir; +// } +// +// public String getMethodName() { +// return methodName; +// } } diff --git a/coselmar-persistence/src/test/resources/coselmar-persistence-test.properties b/coselmar-persistence/src/test/resources/coselmar-persistence-test.properties new file mode 100644 index 0000000..17a19aa --- /dev/null +++ b/coselmar-persistence/src/test/resources/coselmar-persistence-test.properties @@ -0,0 +1,31 @@ +### +# #%L +# Coselmar :: Rest Services +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2014 Ifremer, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.url=jdbc:h2:file:${coselmar.data.directory}/db/coselmar +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.hbm2ddl.auto=update +coselmar.version=${project.version} diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index c54358e..622704a 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -102,10 +102,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> 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 d812a69..d448b55 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 @@ -30,7 +30,7 @@ import java.util.Locale; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +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/CoselmarServicesApplicationContext.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarServicesApplicationContext.java index 5d51d8a..5fba3db 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 @@ -35,7 +35,7 @@ import com.google.common.base.Preconditions; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +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; 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 f242785..d614ec3 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 @@ -29,7 +29,7 @@ import java.util.Locale; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +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/CoselmarSimpleServiceSupport.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/CoselmarSimpleServiceSupport.java index 2637293..559d246 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 @@ -26,7 +26,7 @@ package fr.ifremer.coselmar.services; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.entity.CoselmarUserTopiaDao; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +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 120e10e..373853b 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 @@ -34,13 +34,14 @@ import java.util.Map; import com.auth0.jwt.JWTVerifier; import fr.ifremer.coselmar.beans.UserWebToken; +import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.entity.CoselmarUser; import fr.ifremer.coselmar.persistence.entity.CoselmarUserGroupTopiaDao; import fr.ifremer.coselmar.persistence.entity.CoselmarUserTopiaDao; import fr.ifremer.coselmar.persistence.entity.DocumentTopiaDao; import fr.ifremer.coselmar.persistence.entity.QuestionTopiaDao; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.errors.InvalidCredentialException; import fr.ifremer.coselmar.services.v1.DocumentsWebService; import org.apache.commons.codec.binary.Base64; 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 95a41ae..e1e4719 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 @@ -32,9 +32,10 @@ import java.security.SecureRandom; import java.util.Date; import java.util.Locale; +import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +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; 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 27fd883..e668303 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 @@ -27,7 +27,7 @@ package fr.ifremer.coselmar.services.indexation; import java.io.File; import java.io.IOException; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.lucene.analysis.Analyzer; diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java index 6a158ba..351fa3e 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/AdminWebService.java @@ -34,7 +34,7 @@ import fr.ifremer.coselmar.converter.BeanEntityConverter; import fr.ifremer.coselmar.persistence.entity.CoselmarUserRole; import fr.ifremer.coselmar.persistence.entity.Document; import fr.ifremer.coselmar.persistence.entity.Question; -import fr.ifremer.coselmar.services.CoselmarTechnicalException; +import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import fr.ifremer.coselmar.services.CoselmarWebServiceSupport; import fr.ifremer.coselmar.services.errors.InvalidCredentialException; import fr.ifremer.coselmar.services.errors.UnauthorizedException; 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 63dbf28..5c7ae0e 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 @@ -43,7 +43,7 @@ import fr.ifremer.coselmar.persistence.entity.CoselmarUser; import fr.ifremer.coselmar.persistence.entity.CoselmarUserRole; import fr.ifremer.coselmar.persistence.entity.Document; import fr.ifremer.coselmar.persistence.entity.Privacy; -import fr.ifremer.coselmar.services.CoselmarTechnicalException; +import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import fr.ifremer.coselmar.services.CoselmarWebServiceSupport; import fr.ifremer.coselmar.services.errors.InvalidCredentialException; import fr.ifremer.coselmar.services.errors.NoResultException; 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 e95711e..1625453 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 @@ -47,9 +47,9 @@ import fr.ifremer.coselmar.converter.BeanEntityConverter; import fr.ifremer.coselmar.persistence.SearchRequestBean; import fr.ifremer.coselmar.persistence.entity.CoselmarUser; import fr.ifremer.coselmar.persistence.entity.CoselmarUserRole; -import fr.ifremer.coselmar.services.CoselmarTechnicalException; +import fr.ifremer.coselmar.exceptions.CoselmarTechnicalException; import fr.ifremer.coselmar.services.CoselmarWebServiceSupport; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +import fr.ifremer.coselmar.config.CoselmarServicesConfig; import fr.ifremer.coselmar.services.errors.InvalidCredentialException; import fr.ifremer.coselmar.services.errors.UnauthorizedException; import org.apache.commons.io.Charsets; diff --git a/coselmar-rest/src/main/resources/mapping b/coselmar-rest/src/main/resources/mapping index b74e068..a349733 100644 --- a/coselmar-rest/src/main/resources/mapping +++ b/coselmar-rest/src/main/resources/mapping @@ -17,7 +17,7 @@ default.render=fr.ifremer.coselmar.services.CoselmarRender fr.ifremer.coselmar.services.errors.InvalidCredentialException ErrorAction.on401 fr.ifremer.coselmar.services.errors.UnauthorizedException ErrorAction.on403 fr.ifremer.coselmar.services.errors.NoResultException ErrorAction.on404 -fr.ifremer.coselmar.services.CoselmarTechnicalException ErrorAction.on500 +fr.ifremer.coselmar.exceptions.CoselmarTechnicalException ErrorAction.on500 org.nuiton.topia.persistence.TopiaNoResultException ErrorAction.on404 [actions] diff --git a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java index b619a03..672c87c 100644 --- a/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java +++ b/coselmar-rest/src/test/java/fr/ifremer/coselmar/services/FakeCoselmarApplicationContext.java @@ -37,8 +37,8 @@ import java.util.concurrent.atomic.AtomicInteger; import fr.ifremer.coselmar.persistence.CoselmarPersistenceContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfigOption; +import fr.ifremer.coselmar.config.CoselmarServicesConfig; +import fr.ifremer.coselmar.config.CoselmarServicesConfigOption; import fr.ifremer.coselmar.services.indexation.LuceneUtils; import fr.ifremer.coselmar.services.v1.InitialisationService; import org.apache.commons.logging.Log; 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 bc28811..22df005 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 @@ -30,7 +30,7 @@ import java.util.Locale; import com.google.common.base.Preconditions; import fr.ifremer.coselmar.persistence.CoselmarTopiaApplicationContext; import fr.ifremer.coselmar.persistence.CoselmarTopiaPersistenceContext; -import fr.ifremer.coselmar.services.config.CoselmarServicesConfig; +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; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm