This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 4096c8a719408ec9f8e389fd026056de35d049f9 Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 09:01:01 2017 +0100 Update librairies version --- .../persistence/PollenTopiaApplicationContext.java | 5 ++- .../persistence/PollenTopiaPersistenceContext.java | 15 ++----- pollen-rest-api/pom.xml | 2 +- .../rest/api/injector/PollenBeanIdInjector.java | 2 +- .../src/main/resources/pollen-rest-api.properties | 2 +- .../services/service/FavoriteListService.java | 5 +++ .../pollen/services/service/PollenUserService.java | 10 +++++ .../test/FakePollenApplicationContext.java | 25 +++++++++-- .../src/test/resources/pollen-services.properties | 2 +- pom.xml | 52 +++++++++++----------- 10 files changed, 72 insertions(+), 48 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaApplicationContext.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaApplicationContext.java index 6363861..e3ee5bf 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaApplicationContext.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaApplicationContext.java @@ -21,6 +21,7 @@ package org.chorem.pollen.persistence; * #L% */ +import org.nuiton.topia.persistence.TopiaConfiguration; import org.nuiton.topia.persistence.TopiaIdFactory; import java.util.Map; @@ -28,8 +29,8 @@ import java.util.Properties; public class PollenTopiaApplicationContext extends AbstractPollenTopiaApplicationContext { - public PollenTopiaApplicationContext(Properties properties) { - super(properties); + public PollenTopiaApplicationContext(TopiaConfiguration topiaConfiguration) { + super(topiaConfiguration); } public PollenTopiaApplicationContext(Map<String, String> configuration) { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java index a8184be..9c968dd 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/PollenTopiaPersistenceContext.java @@ -21,21 +21,12 @@ package org.chorem.pollen.persistence; * #L% */ -import org.nuiton.topia.persistence.TopiaIdFactory; -import org.nuiton.topia.persistence.internal.HibernateProvider; -import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; -import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; +import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; public class PollenTopiaPersistenceContext extends AbstractPollenTopiaPersistenceContext { - public PollenTopiaPersistenceContext(HibernateProvider hibernateProvider, - TopiaFiresSupport listenableSupport, - TopiaIdFactory topiaIdFactory, - TopiaHibernateSessionRegistry sessionRegistry) { - super(hibernateProvider, - listenableSupport, - topiaIdFactory, - sessionRegistry); + public PollenTopiaPersistenceContext(AbstractTopiaPersistenceContextConstructorParameter parameter) { + super(parameter); } } diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index d9db3ba..12ef0c2 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -203,7 +203,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/injector/PollenBeanIdInjector.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/injector/PollenBeanIdInjector.java index a80e929..2a2dae2 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/injector/PollenBeanIdInjector.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/injector/PollenBeanIdInjector.java @@ -52,7 +52,7 @@ public class PollenBeanIdInjector implements ExecutorParametersInjectorHandler.I if (PollenEntityId.class.isAssignableFrom(type)) { result = PollenEntityId.newId(generic); - Call.ParameterTree parameterTree = call.getParameterTree().getTree().get(name); + Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); if (parameterTree != null && parameterTree.getValue() != null) { diff --git a/pollen-rest-api/src/main/resources/pollen-rest-api.properties b/pollen-rest-api/src/main/resources/pollen-rest-api.properties index b823825..6a5e7d3 100644 --- a/pollen-rest-api/src/main/resources/pollen-rest-api.properties +++ b/pollen-rest-api/src/main/resources/pollen-rest-api.properties @@ -23,5 +23,5 @@ hibernate.connection.url=jdbc:h2:file:${pollen.data.directory}/db/pollen-rest-ap hibernate.connection.username=sa hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver -hibernate.hbm2ddl.auto=update +#hibernate.hbm2ddl.auto=update pollen.version=${project.version} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 6b4b528..d38bfb0 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -23,6 +23,7 @@ package org.chorem.pollen.services.service; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.persistence.entity.FavoriteList; @@ -481,6 +482,10 @@ public class FavoriteListService extends PollenServiceSupport { } + if (StringUtils.isEmpty(paginationParameter.getOrder())) { + paginationParameter.setOrder(FavoriteList.PROPERTY_NAME); + } + PaginationParameter parameter = paginationParameter.toPaginationParameter(); return parameter; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index b2db46f..727eca5 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -23,6 +23,8 @@ package org.chorem.pollen.services.service; import com.google.common.base.Function; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.util.CollectionUtils; import org.chorem.pollen.persistence.entity.*; import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.bean.PaginationParameterBean; @@ -31,6 +33,7 @@ import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollenUserBean; import org.chorem.pollen.services.service.security.PollenInvalidEmailActivationTokenException; import org.chorem.pollen.services.service.security.PollenInvalidPasswordException; +import org.nuiton.util.pagination.PaginationOrder; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -65,6 +68,9 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer checkIsAdmin(); PaginationParameter page = getPaginationParameter(paginationParameter); + if (CollectionUtils.isEmpty(page.getOrderClauses())) { + page.getOrderClauses().add(new PaginationOrder(PollenUser.PROPERTY_NAME, false)); + } PaginationResult<PollenUser> pollenUsers = getPollenUserDao().forAll().findPage(page); PaginationResultBean<PollenUserBean> pollenUserBeans = toPaginationListBean(PollenUserBean.class, pollenUsers, pollenUserFunction); @@ -398,6 +404,10 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } + if (StringUtils.isEmpty(paginationParameter.getOrder())) { + paginationParameter.setOrder(PollenUser.PROPERTY_NAME); + } + PaginationParameter parameter = paginationParameter.toPaginationParameter(); return parameter; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java index 9292eba..03eb299 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java @@ -21,6 +21,10 @@ package org.chorem.pollen.services.test; * #L% */ +import com.google.common.base.Joiner; +import com.google.common.base.Preconditions; +import com.google.common.base.StandardSystemProperty; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.SecurityUtils; @@ -40,8 +44,8 @@ import org.chorem.pollen.services.service.security.PollenSecurityRealm; import org.chorem.pollen.votecounting.VoteCountingFactory; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import org.nuiton.topia.junit.ConfigurationHelper; import org.nuiton.util.DateUtil; +import org.nuiton.util.FileUtil; import java.io.File; import java.io.IOException; @@ -82,6 +86,8 @@ public class FakePollenApplicationContext extends TestWatcher implements PollenA protected final String configurationPath; + protected static final String TIMESTAMP = String.valueOf(System.nanoTime()); + public FakePollenApplicationContext(String configurationPath) { this.configurationPath = configurationPath; } @@ -97,10 +103,21 @@ public class FakePollenApplicationContext extends TestWatcher implements PollenA methodName = description.getMethodName(); + String javaIoTmpDir = StandardSystemProperty.JAVA_IO_TMPDIR.value(); + Preconditions.checkState( + StringUtils.isNotBlank(javaIoTmpDir), + "'" + StandardSystemProperty.JAVA_IO_TMPDIR.key() + "' is not defined in environment" + ); + File tempDirectoryFile = new File(javaIoTmpDir); + FileUtil.createDirectoryIfNecessary(tempDirectoryFile); + + String path = Joiner.on(File.separator).join(TIMESTAMP, description.getTestClass().getName(), description.getMethodName(), "h2"); + // get test directory - testBasedir = ConfigurationHelper.getTestSpecificDirectory( - description.getTestClass(), - description.getMethodName()); + testBasedir = new File(tempDirectoryFile, path); +// testBasedir = ConfigurationHelper.getTestSpecificDirectory( +// description.getTestClass(), +// description.getMethodName()); if (log.isDebugEnabled()) { log.debug("testBasedir: " + testBasedir); diff --git a/pollen-services/src/test/resources/pollen-services.properties b/pollen-services/src/test/resources/pollen-services.properties index cb72429..8adb06d 100644 --- a/pollen-services/src/test/resources/pollen-services.properties +++ b/pollen-services/src/test/resources/pollen-services.properties @@ -23,6 +23,6 @@ hibernate.connection.url=jdbc:h2:file:${pollen.data.directory}/db/pollen-rest-ap hibernate.connection.username=sa hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver -hibernate.hbm2ddl.auto=update +#hibernate.hbm2ddl.auto=update pollen.version=${project.version} pollen.ui.host=http://localhost diff --git a/pom.xml b/pom.xml index 44333d1..6596a85 100644 --- a/pom.xml +++ b/pom.xml @@ -174,27 +174,27 @@ <projectId>pollen</projectId> <!-- customized versions --> - <webmotionVersion>2.4.1-20140826-pollen2</webmotionVersion> + <webmotionVersion>2.5.1</webmotionVersion> - <nuitonI18nVersion>3.3</nuitonI18nVersion> - <eugenePluginVersion>2.13</eugenePluginVersion> - <topiaVersion>3.0-beta-12</topiaVersion> + <nuitonI18nVersion>3.6.2</nuitonI18nVersion> + <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> + <topiaVersion>3.2</topiaVersion> - <nuitonWebVersion>1.17</nuitonWebVersion> - <nuitonUtilsVersion>3.0-rc-7</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-rc-1</nuitonConfigVersion> + <nuitonWebVersion>1.18</nuitonWebVersion> + <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> + <nuitonConfigVersion>3.1.1</nuitonConfigVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> - <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> + <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <h2Version>1.4.178</h2Version> - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <postgresqlVersion>9.4.1212.jre7</postgresqlVersion> <shiroVersion>1.2.3</shiroVersion> - <slf4jVersion>1.7.7</slf4jVersion> + <slf4jVersion>1.7.22</slf4jVersion> <jettyVersion>9.0.3.v20130506</jettyVersion> <tomcatEmbedVersion>7.0.50</tomcatEmbedVersion> <!--tomcatEmbedVersion>8.0.5</tomcatEmbedVersion--> - <hibernateVersion>4.3.5.Final</hibernateVersion> + <hibernateVersion>5.1.3.Final</hibernateVersion> <seleniumVersion>2.33.0</seleniumVersion> - <httpCommonsHttpclientVersion>4.3.3</httpCommonsHttpclientVersion> + <httpCommonsHttpclientVersion>4.5.2</httpCommonsHttpclientVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle> <!-- license to use --> @@ -250,12 +250,12 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.0</version> + <version>4.1</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>3.5</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -265,29 +265,29 @@ <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> + <version>1.9.3</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.9</version> + <version>1.10</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> - <version>1.3.2</version> + <version>1.4</version> </dependency> <!-- Guava --> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>17.0</version> + <version>20.0</version> </dependency> <!-- persistence module dependencies --> @@ -326,11 +326,11 @@ <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> - <version>1.06</version> + <version>1.11</version> </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgresqlVersion}</version> </dependency> @@ -448,7 +448,7 @@ <dependency> <groupId>com.github.spullara.mustache.java</groupId> <artifactId>compiler</artifactId> - <version>0.8.15</version> + <version>0.9.4</version> </dependency> <!--dependency> @@ -467,7 +467,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.3.2</version> + <version>4.4.5</version> </dependency> <dependency> @@ -479,7 +479,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.2.4</version> + <version>2.8.0</version> </dependency> <dependency> @@ -604,7 +604,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> + <version>2.5.3</version> <scope>test</scope> </dependency> <dependency> @@ -617,7 +617,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.