- Topia-commits - mailman.cloud.codelutin.com

r2923 - in tags: . topia-3.0-alpha-7
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 10:33:00 +0100 (Thu, 12 Dec 2013) New Revision: 2923 Url: http://nuiton.org/projects/topia/repository/revisions/2923 Log: [maven-release-plugin] copy for tag topia-3.0-alpha-7 Added: tags/topia-3.0-alpha-7/ Property changes on: tags/topia-3.0-alpha-7 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2922 - in trunk: . topia-it topia-junit topia-persistence topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: maven-release Date: 2013-12-12 10:32:56 +0100 (Thu, 12 Dec 2013) New Revision: 2922 Url: http://nuiton.org/projects/topia/repository/revisions/2922 Log: [maven-release-plugin] prepare release topia-3.0-alpha-7 Modified: trunk/pom.xml trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-templates/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -210,12 +210,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-7</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/trunk + scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-7 </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/trunk + http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-7 </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-it/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-junit/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-persistence/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-service-migration/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-service-replication/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) +++ trunk/topia-templates/pom.xml 2013-12-12 09:32:56 UTC (rev 2922) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-7</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2921 - trunk
by athimel＠users.nuiton.org 12 Dec '13

12 Dec '13

Author: athimel Date: 2013-12-12 10:27:49 +0100 (Thu, 12 Dec 2013) New Revision: 2921 Url: http://nuiton.org/projects/topia/repository/revisions/2921 Log: Update to mavenpom 4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-10 20:26:55 UTC (rev 2920) +++ trunk/pom.xml 2013-12-12 09:27:49 UTC (rev 2921) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.4-SNAPSHOT</version> + <version>4.4</version> </parent> <artifactId>topia</artifactId>

1 0

r2920 - in trunk: topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/test/java/org/nuiton/topia topia-persistence/src/test/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org 10 Dec '13

10 Dec '13

Author: bleny Date: 2013-12-10 21:26:55 +0100 (Tue, 10 Dec 2013) New Revision: 2920 Url: http://nuiton.org/projects/topia/repository/revisions/2920 Log: refs #2894 fixes some TODO in HqlAndParametersBuilder ; move HqlAndParametersBuilderTest back to its place (its not legacy and its not an IT) Added: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java Removed: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java Deleted: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java 2013-12-09 17:08:02 UTC (rev 2919) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java 2013-12-10 20:26:55 UTC (rev 2920) @@ -1,161 +0,0 @@ -package org.nuiton.topia.it.legacy.persistence; - -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import org.junit.Assert; -import org.junit.Test; -import org.nuiton.topia.persistence.HqlAndParametersBuilder; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.util.Collection; -import java.util.Collections; - -public class HqlAndParametersBuilderTest { - - protected class MyHqlAndParametersBuilder extends HqlAndParametersBuilder { - - public MyHqlAndParametersBuilder(Class entityClass) { - super(entityClass); - } - - @Override - public String putHqlParameterWithAvailableName(String propertyName, Object value) { - return super.putHqlParameterWithAvailableName(propertyName, value); - } - - } - - protected MyHqlAndParametersBuilder hqlAndParametersBuilder = - new MyHqlAndParametersBuilder(TopiaEntity.class); - - protected static final Collection<String> SOME_VALUES = - Lists.newArrayList("value1", "value2", "value3"); - - protected static final Collection<String> SOME_VALUES_WITH_NULL = - Lists.newArrayList("value1", "value2", null, "value3"); - - @Test - public void testFindAvailableHqlParameterName() { - - String availableHqlParameterName1 = hqlAndParametersBuilder.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); - String availableHqlParameterName2 = hqlAndParametersBuilder.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); - - Assert.assertNotEquals(availableHqlParameterName1, availableHqlParameterName2); - Assert.assertFalse(availableHqlParameterName1.contains(".")); - Assert.assertFalse(availableHqlParameterName2.contains(".")); - - } - - @Test - public void testEqualsNull() { - - hqlAndParametersBuilder.addEquals("myProp", null); - - String actualHql = hqlAndParametersBuilder.getHql(); - - Assert.assertFalse(actualHql.contains("myProp = null")); - Assert.assertTrue(actualHql.contains("myProp is null")); - - } - - @Test - public void testAddInWithNull() { - - hqlAndParametersBuilder.addIn("myProp", SOME_VALUES_WITH_NULL); - - String actualHql = hqlAndParametersBuilder.getHql(); - - Assert.assertTrue(actualHql.contains("myProp is null or topiaEntity_.myProp in (")); - Assert.assertEquals( - SOME_VALUES_WITH_NULL.size() - 1, // there should be as many argument as in collection minus 1 because null is removed - hqlAndParametersBuilder.getHqlParameters().size()); - - } - - @Test - public void testAddNotEqualsToValue() { - - hqlAndParametersBuilder.addNotEquals("myProp", "value"); - - String actualHql = hqlAndParametersBuilder.getHql(); - - Assert.assertTrue(actualHql.contains("myProp != ")); - Assert.assertFalse(actualHql.contains("myProp = ")); - - } - - @Test - public void testAddNotEqualsToNull() { - - hqlAndParametersBuilder.addNotEquals("myProp", null); - - String actualHql = hqlAndParametersBuilder.getHql(); - - Assert.assertTrue(actualHql.contains("myProp is not null")); - - } - - @Test - public void testAddNotInWithNull() { - - hqlAndParametersBuilder.addNotIn("myProp", SOME_VALUES_WITH_NULL); - - String actualHql = hqlAndParametersBuilder.getHql(); - - Assert.assertTrue(actualHql.contains("myProp is not null and ")); - - } - - @Test - public void testAddInWithEmptyValues() { - - hqlAndParametersBuilder.addIn("myProp", Collections.emptyList()); - - String actualHql = hqlAndParametersBuilder.getHql(); - - Assert.assertFalse(actualHql.contains("myProp in (:)")); - Assert.assertTrue(actualHql.contains("myProp in ()")); - - } - - /** - * Check that the final joining on where clauses (with "and") isn't - * broken by a where clause containing a "or". - */ - @Test - public void testPreventOrKillsAnd() { - - hqlAndParametersBuilder.addEquals("myProp1", "myValue1"); - hqlAndParametersBuilder.addIn("myProp2", SOME_VALUES_WITH_NULL); - - String actualHql = hqlAndParametersBuilder.getHql(); - - Assert.assertFalse(actualHql.contains("topiaEntity_.myProp1 = :myProp1 and topiaEntity_.myProp2 is null or topiaEntity_.myProp2 in (:myProp2, :myProp21, :myProp22)")); - Assert.assertTrue(actualHql.contains("(topiaEntity_.myProp1 = :myProp1) and (topiaEntity_.myProp2 is null or topiaEntity_.myProp2 in (:myProp2, :myProp21, :myProp22))")); - - } - -} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-12-09 17:08:02 UTC (rev 2919) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-12-10 20:26:55 UTC (rev 2920) @@ -30,6 +30,7 @@ import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; import java.util.Arrays; import java.util.Map; @@ -202,12 +203,15 @@ } public void addWhereClause(String whereClause) { + Preconditions.checkArgument(StringUtils.isNotBlank(whereClause)); whereClauses.add(whereClause); } public void addWhereClause(String whereClause, Map<String, Object> hqlParameters) { - whereClauses.add(whereClause); - // TODO brendan 02/10/13 check parameters names are not already used + Preconditions.checkNotNull(hqlParameters); + boolean noCollision = Sets.intersection(parameters.keySet(), hqlParameters.keySet()).isEmpty(); + Preconditions.checkArgument(noCollision, "given arguments " + hqlParameters.keySet() + " contains a conflicting name with the already defined parameters of the query (" + parameters.keySet() + "). You should changes the names of given arguments."); + addWhereClause(whereClause); parameters.putAll(hqlParameters); } @@ -224,6 +228,23 @@ return hql; } + /** Converts a (nested) property name to an HQL argument name. + * + * For example getParameterName("yearlyDeclaration.survey.topiaId") → "yearlyDeclarationSurveyTopiaId" + * + * @param propertyName the name of a property, can be a path to a + * nested property + * @return a string that can syntactically be used as an HQL parameter + * name, not prefixed by ':' + */ + protected String getParameterName(String propertyName) { + Preconditions.checkArgument(StringUtils.isNotBlank(propertyName)); + String capitalize = WordUtils.capitalize(propertyName, '.'); + String withoutDots = capitalize.replaceAll("\\.", ""); + String parameterName = StringUtils.uncapitalize(withoutDots); + return parameterName; + } + /** * Add a parameter in the parameters map searching with the suitable parameter name * in order to prevent conflicts. @@ -231,8 +252,7 @@ * @return the found key where the parameter has been added, suitable to use in the where clause */ protected String putHqlParameterWithAvailableName(String propertyName, Object value) { - // TODO brendan 01/10/13 replace survey.topiaId by surveyTopiaId - String parameterNamePrefix = propertyName.replaceAll("\\.", ""); + String parameterNamePrefix = getParameterName(propertyName); int suffix = 0; String parameterName = parameterNamePrefix; while (parameters.containsKey(parameterName)) { Copied: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java (from rev 2919, trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java) =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2013-12-10 20:26:55 UTC (rev 2920) @@ -0,0 +1,192 @@ +package org.nuiton.topia.persistence; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Collection; +import java.util.Collections; + +public class HqlAndParametersBuilderTest { + + protected class MyHqlAndParametersBuilder extends HqlAndParametersBuilder { + + public MyHqlAndParametersBuilder(Class entityClass) { + super(entityClass); + } + + @Override + public String putHqlParameterWithAvailableName(String propertyName, Object value) { + return super.putHqlParameterWithAvailableName(propertyName, value); + } + + } + + protected MyHqlAndParametersBuilder hqlAndParametersBuilder = + new MyHqlAndParametersBuilder(TopiaEntity.class); + + protected static final Collection<String> SOME_VALUES = + Lists.newArrayList("value1", "value2", "value3"); + + protected static final Collection<String> SOME_VALUES_WITH_NULL = + Lists.newArrayList("value1", "value2", null, "value3"); + + @Test + public void testFindAvailableHqlParameterName() { + + String availableHqlParameterName1 = hqlAndParametersBuilder.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); + String availableHqlParameterName2 = hqlAndParametersBuilder.putHqlParameterWithAvailableName("survey.topiaId", "topiaId1"); + + Assert.assertNotEquals(availableHqlParameterName1, availableHqlParameterName2); + Assert.assertFalse(availableHqlParameterName1.contains(".")); + Assert.assertFalse(availableHqlParameterName2.contains(".")); + + } + + @Test + public void testEqualsNull() { + + hqlAndParametersBuilder.addEquals("myProp", null); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertFalse(actualHql.contains("myProp = null")); + Assert.assertTrue(actualHql.contains("myProp is null")); + + } + + @Test + public void testAddInWithNull() { + + hqlAndParametersBuilder.addIn("myProp", SOME_VALUES_WITH_NULL); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp is null or topiaEntity_.myProp in (")); + Assert.assertEquals( + SOME_VALUES_WITH_NULL.size() - 1, // there should be as many argument as in collection minus 1 because null is removed + hqlAndParametersBuilder.getHqlParameters().size()); + + } + + @Test + public void testAddNotEqualsToValue() { + + hqlAndParametersBuilder.addNotEquals("myProp", "value"); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp != ")); + Assert.assertFalse(actualHql.contains("myProp = ")); + + } + + @Test + public void testAddNotEqualsToNull() { + + hqlAndParametersBuilder.addNotEquals("myProp", null); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp is not null")); + + } + + @Test + public void testAddNotInWithNull() { + + hqlAndParametersBuilder.addNotIn("myProp", SOME_VALUES_WITH_NULL); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertTrue(actualHql.contains("myProp is not null and ")); + + } + + @Test + public void testAddInWithEmptyValues() { + + hqlAndParametersBuilder.addIn("myProp", Collections.emptyList()); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertFalse(actualHql.contains("myProp in (:)")); + Assert.assertTrue(actualHql.contains("myProp in ()")); + + } + + /** + * Check that the final joining on where clauses (with "and") isn't + * broken by a where clause containing a "or". + */ + @Test + public void testPreventOrKillsAnd() { + + hqlAndParametersBuilder.addEquals("myProp1", "myValue1"); + hqlAndParametersBuilder.addIn("myProp2", SOME_VALUES_WITH_NULL); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertFalse(actualHql.contains("topiaEntity_.myProp1 = :myProp1 and topiaEntity_.myProp2 is null or topiaEntity_.myProp2 in (:myProp2, :myProp21, :myProp22)")); + Assert.assertTrue(actualHql.contains("(topiaEntity_.myProp1 = :myProp1) and (topiaEntity_.myProp2 is null or topiaEntity_.myProp2 in (:myProp2, :myProp21, :myProp22))")); + + } + + @Test + public void testGetParameterName() { + + String actualParameterName = hqlAndParametersBuilder.getParameterName("yearlyDeclaration.survey.topiaId"); + + Assert.assertFalse("an hql argument name must not contains '.'", actualParameterName.contains(".")); + Assert.assertFalse("an hql argument name must not contains ' '", actualParameterName.contains(" ")); + Assert.assertFalse("an hql argument name must not contains ':'", actualParameterName.contains(":")); + + Assert.assertEquals("yearlyDeclarationSurveyTopiaId", actualParameterName); + + } + @Test + public void testPreventRemoveParameters() { + + ImmutableMap<String, String> hqlParameters = + ImmutableMap.of("myParameter1", "aRandomValue"); + + ImmutableMap<String, String> conflictingHqlParameters = + ImmutableMap.of("myParameter1", "anotherRandomValue"); + + hqlAndParametersBuilder.addWhereClause("myProperty = :myParameter1", hqlParameters); + + try { + hqlAndParametersBuilder.addWhereClause("myOtherProperty = :myParameter1", conflictingHqlParameters); + Assert.fail("an exception should have been raised"); + } catch (IllegalArgumentException e) { + Assert.assertTrue( + "the exception message must contains the conflicting argument name", + e.getMessage().contains("myParameter1")); + } + + } +}

1 0

r2919 - in trunk: topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org 09 Dec '13

09 Dec '13

Author: bleny Date: 2013-12-09 18:08:02 +0100 (Mon, 09 Dec 2013) New Revision: 2919 Url: http://nuiton.org/projects/topia/repository/revisions/2919 Log: fixes HqlAndParametersBuilder if a whereClause contains a or Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java 2013-12-06 10:40:22 UTC (rev 2918) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/HqlAndParametersBuilderTest.java 2013-12-09 17:08:02 UTC (rev 2919) @@ -35,7 +35,7 @@ public class HqlAndParametersBuilderTest { - class MyHqlAndParametersBuilder extends HqlAndParametersBuilder { + protected class MyHqlAndParametersBuilder extends HqlAndParametersBuilder { public MyHqlAndParametersBuilder(Class entityClass) { super(entityClass); @@ -45,7 +45,9 @@ public String putHqlParameterWithAvailableName(String propertyName, Object value) { return super.putHqlParameterWithAvailableName(propertyName, value); } + } + protected MyHqlAndParametersBuilder hqlAndParametersBuilder = new MyHqlAndParametersBuilder(TopiaEntity.class); @@ -139,4 +141,21 @@ } + /** + * Check that the final joining on where clauses (with "and") isn't + * broken by a where clause containing a "or". + */ + @Test + public void testPreventOrKillsAnd() { + + hqlAndParametersBuilder.addEquals("myProp1", "myValue1"); + hqlAndParametersBuilder.addIn("myProp2", SOME_VALUES_WITH_NULL); + + String actualHql = hqlAndParametersBuilder.getHql(); + + Assert.assertFalse(actualHql.contains("topiaEntity_.myProp1 = :myProp1 and topiaEntity_.myProp2 is null or topiaEntity_.myProp2 in (:myProp2, :myProp21, :myProp22)")); + Assert.assertTrue(actualHql.contains("(topiaEntity_.myProp1 = :myProp1) and (topiaEntity_.myProp2 is null or topiaEntity_.myProp2 in (:myProp2, :myProp21, :myProp22))")); + + } + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-12-06 10:40:22 UTC (rev 2918) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2013-12-09 17:08:02 UTC (rev 2919) @@ -215,7 +215,7 @@ StringBuilder hqlStringBuilder = new StringBuilder(); hqlStringBuilder.append("from ").append(entityClass.getCanonicalName()).append(" ").append(alias); if ( ! whereClauses.isEmpty()) { - hqlStringBuilder.append(" where ").append(StringUtils.join(whereClauses, " and ")); + hqlStringBuilder.append(" where (").append(StringUtils.join(whereClauses, ") and (")).append(")"); } if (CollectionUtils.isNotEmpty(orderByArguments)) { hqlStringBuilder.append(" order by ").append(alias).append(".").append(StringUtils.join(orderByArguments, ", " + alias + "."));

1 0

r2918 - trunk
by athimel＠users.nuiton.org 06 Dec '13

06 Dec '13

Author: athimel Date: 2013-12-06 11:40:22 +0100 (Fri, 06 Dec 2013) New Revision: 2918 Url: http://nuiton.org/projects/topia/repository/revisions/2918 Log: Usa mavenpom 4.4-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-05 07:58:12 UTC (rev 2917) +++ trunk/pom.xml 2013-12-06 10:40:22 UTC (rev 2918) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.3</version> + <version>4.4-SNAPSHOT</version> </parent> <artifactId>topia</artifactId>

1 0

r2917 - in trunk: . topia-persistence topia-templates
by tchemit＠users.nuiton.org 05 Dec '13

05 Dec '13

Author: tchemit Date: 2013-12-05 08:58:12 +0100 (Thu, 05 Dec 2013) New Revision: 2917 Url: http://nuiton.org/projects/topia/repository/revisions/2917 Log: fixes #2957: Update Hibernate to 4.2.8.Final Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-templates/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) +++ trunk/pom.xml 2013-12-05 07:58:12 UTC (rev 2917) @@ -240,7 +240,7 @@ <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.2.7.SP1</hibernateVersion> + <hibernateVersion>4.2.8.Final</hibernateVersion> <sl4jVersion>1.7.5</sl4jVersion> <h2Version>1.3.172</h2Version> <hamcrestVersion>1.3</hamcrestVersion> @@ -315,9 +315,9 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> + <version>3.18.1-GA</version> <scope>runtime</scope> </dependency> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) +++ trunk/topia-persistence/pom.xml 2013-12-05 07:58:12 UTC (rev 2917) @@ -103,7 +103,7 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) +++ trunk/topia-templates/pom.xml 2013-12-05 07:58:12 UTC (rev 2917) @@ -93,7 +93,7 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency>

1 0

[ANN] - ToPIA 3.0-alpha-6 released
by nuiton.org Release Notification 03 Dec '13

03 Dec '13

The ToPIA team is pleased to announce the topia-3.0-alpha-6 release! Tools for Portable and Independent Architecture : Framework de persistance et de distribution d'application. Documentation of the project can be found here: http://maven-site.nuiton.org/topia Changes ------- Changes in this version include: New features: o Rename commitTransaction() and rollbackTransaction() to commit() and rollback() Issue: 2899. Thanks to Brendan Le Ny. Resolved by tchemit. o Maintain a reference between an XxxApplicationContext and its sub-XxxPersistenceContext's Issue: 2922. Thanks to Arnaud Thimel. Resolved by athimel. o Improve Sql APIs Issue: 2926. Thanks to Tony Chemit. Resolved by tchemit. o Make sure AbstractTopiaDao does not rely on TopiaHibernateSupport Issue: 2925. Thanks to Arnaud Thimel. Resolved by athimel. Fixed Bugs: o forXXXIn(Iterable) fail if empty collection is passed Issue: 2953. Thanks to Brendan Le Ny. Resolved by bleny. Changes: o Drop all deprecated code Issue: 2923. Thanks to Arnaud Thimel. Resolved by athimel. o Update to hibernate 4.2.7.SP1 Issue: 2950. Thanks to Éric Chatellier. Resolved by echatellier. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|topia|3.0-alpha-6|jar Have fun! -ToPIA team

1 0

r2916 - in trunk: . topia-it topia-junit topia-persistence topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 03 Dec '13

03 Dec '13

Author: maven-release Date: 2013-12-03 19:38:24 +0100 (Tue, 03 Dec 2013) New Revision: 2916 Url: http://nuiton.org/projects/topia/repository/revisions/2916 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-templates/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-03 18:38:21 UTC (rev 2915) +++ trunk/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-alpha-6</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -210,12 +210,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-6</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-6 + scm:svn:http://svn.nuiton.org/svn/topia/trunk </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-6 + http://nuiton.org/projects/topia/repository/show/trunk </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2013-12-03 18:38:21 UTC (rev 2915) +++ trunk/topia-it/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2013-12-03 18:38:21 UTC (rev 2915) +++ trunk/topia-junit/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2013-12-03 18:38:21 UTC (rev 2915) +++ trunk/topia-persistence/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2013-12-03 18:38:21 UTC (rev 2915) +++ trunk/topia-service-migration/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2013-12-03 18:38:21 UTC (rev 2915) +++ trunk/topia-service-replication/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2013-12-03 18:38:21 UTC (rev 2915) +++ trunk/topia-templates/pom.xml 2013-12-03 18:38:24 UTC (rev 2916) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-6</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2915 - in tags: . topia-3.0-alpha-6
by maven-release＠users.nuiton.org 03 Dec '13

03 Dec '13

Author: maven-release Date: 2013-12-03 19:38:21 +0100 (Tue, 03 Dec 2013) New Revision: 2915 Url: http://nuiton.org/projects/topia/repository/revisions/2915 Log: [maven-release-plugin] copy for tag topia-3.0-alpha-6 Added: tags/topia-3.0-alpha-6/ Property changes on: tags/topia-3.0-alpha-6 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0