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

r3056 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org 09 Apr '14

09 Apr '14

Author: tchemit Date: 2014-04-09 15:47:26 +0200 (Wed, 09 Apr 2014) New Revision: 3056 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3056 Log: fixes #3143: HqlAndParameterBuilder.addWhereClause fails because of parameters collision Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 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 2014-04-08 15:36:22 UTC (rev 3055) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-04-09 13:47:26 UTC (rev 3056) @@ -201,11 +201,30 @@ public void addWhereClause(String whereClause, Map<String, Object> hqlParameters) { 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."); + Set<String> collisiontParameterNames = Sets.newHashSet(Sets.intersection(parameters.keySet(), hqlParameters.keySet())); + boolean noCollision = collisiontParameterNames.isEmpty(); + if (noCollision) { + parameters.putAll(hqlParameters); + } else { + + // add all parameters with no collision + Set<String> noCollisiontParameterNames = Sets.difference(hqlParameters.keySet(), collisiontParameterNames); + for (String parameterName : noCollisiontParameterNames) { + Object parameterValue = hqlParameters.get(parameterName); + parameters.put(parameterName, parameterValue); + } + // resolve all collision parameters + for (String parameterName : collisiontParameterNames) { + Object parameterValue = hqlParameters.get(parameterName); + + // resolved parameter name + String newParameterName = putHqlParameterWithAvailableName(parameterName, parameterValue); + + // replace the :parameterName (with no next alphanumeric caracter) + whereClause = whereClause.replaceAll(":" + parameterName + "(?!\\w)", ":" + newParameterName); + } + } addWhereClause(whereClause); - // FIXME brendan 25/03/14 use putHqlParameterWithAvailableName to prevent conflict - parameters.putAll(hqlParameters); } public void setWhereClauses(Set<String> whereClauses) { Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2014-04-08 15:36:22 UTC (rev 3055) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2014-04-09 13:47:26 UTC (rev 3056) @@ -31,6 +31,7 @@ import java.util.Collection; import java.util.Collections; +import java.util.Map; public class HqlAndParametersBuilderTest { @@ -131,21 +132,34 @@ public void testPreventRemoveParameters() { ImmutableMap<String, String> hqlParameters = - ImmutableMap.of("myParameter1", "aRandomValue"); + ImmutableMap.of("myParameter", "aRandomValue", + "myParameter1", "aRandomValue1", + "myParameter2", "aRandomValue2"); ImmutableMap<String, String> conflictingHqlParameters = - ImmutableMap.of("myParameter1", "anotherRandomValue"); + ImmutableMap.of("myParameter", "anotherRandomValue", + "myParameter1", "anotherRandomValue1", + "myParameter2", "anotherRandomValue2", + "myParameter20", "aSafeValue"); - hqlAndParametersBuilder.addWhereClause("myProperty = :myParameter1", hqlParameters); + hqlAndParametersBuilder.addWhereClause("myProperty = :myParameter, myProperty = :myParameter1, myProperty2 = :myParameter2||", 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")); - } + hqlAndParametersBuilder.addWhereClause("myOtherProperty = :myParameter, myOtherProperty1 = :myParameter1, myOtherProperty2 = :myParameter2, myOtherProperty20 = :myParameter20", conflictingHqlParameters); + Map hqlParameters1 = hqlAndParametersBuilder.getHqlParameters(); + String hql = hqlAndParametersBuilder.getHql(); + Assert.assertEquals(7, hqlParameters1.size()); + Assert.assertEquals("aRandomValue", hqlParameters1.get("myParameter")); + Assert.assertEquals("aRandomValue1", hqlParameters1.get("myParameter1")); + Assert.assertEquals("aRandomValue2", hqlParameters1.get("myParameter2")); + Assert.assertEquals("aSafeValue", hqlParameters1.get("myParameter20")); + Assert.assertEquals("anotherRandomValue", hqlParameters1.get("myParameter0")); // myParameter resolved + Assert.assertEquals("anotherRandomValue1", hqlParameters1.get("myParameter10")); // myParameter1 resolved + Assert.assertEquals("anotherRandomValue2", hqlParameters1.get("myParameter21")); // myParameter2 resolved + + // first sql (not modified) + Assert.assertTrue(hql.contains("myProperty = :myParameter, myProperty = :myParameter1, myProperty2 = :myParameter2||")); + // second sql (with resolved properties) + Assert.assertTrue(hql.contains("myOtherProperty = :myParameter0, myOtherProperty1 = :myParameter10, myOtherProperty2 = :myParameter21, myOtherProperty20 = :myParameter20")); } }

1 0

r3055 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org 08 Apr '14

08 Apr '14

Author: athimel Date: 2014-04-08 17:36:22 +0200 (Tue, 08 Apr 2014) New Revision: 3055 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3055 Log: fixes #3142 Make sure the HqlAndParametersBuilder always use a suffix for each HQL parameter's name Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 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 2014-04-07 14:15:24 UTC (rev 3054) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-04-08 15:36:22 UTC (rev 3055) @@ -273,9 +273,9 @@ protected String putHqlParameterWithAvailableName(String propertyName, Object value) { String parameterNamePrefix = getParameterName(propertyName); int suffix = 0; - String parameterName = parameterNamePrefix; + String parameterName = parameterNamePrefix + suffix; while (parameters.containsKey(parameterName)) { - suffix += 1; + suffix++; parameterName = parameterNamePrefix + suffix; } parameters.put(parameterName, value);

1 0

[ANN] - ToPIA 3.0-beta-1 released
by nuiton.org Release Notification 07 Apr '14

07 Apr '14

The ToPIA team is pleased to announce the topia-3.0-beta-1 release! Tools for Portable and Independent Architecture : Framework de persistance et de distribution d'application. Documentation of the project can be found here: https://doc.nuiton.org/topia Changes ------- Changes in this version include: New features: o Add the TopiaDao#forAll() method Issue: 3141. Thanks to Arnaud Thimel. Resolved by athimel. o allow to add method generic method in a DAO with clean model Issue: 1165. Thanks to Brendan Le Ny. Resolved by bleny. o Remplacer l'utilisation de la requete SQL dans la génération pour le cas du delete N-N Issue: 319. Thanks to Florian DESBOIS. Resolved by fdesbois. o Add a way to delete several entities in one time Issue: 1926. Thanks to Yannick Martel. Resolved by ymartel. o Expose HibernateSupport in DAO Issue: 3120. Thanks to Brendan Le Ny. Resolved by bleny. o Add methods for "like" sql operation Issue: 3118. Thanks to Brendan Le Ny. Resolved by bleny. Fixed Bugs: o Hibernate connection not closed since 4.3.1 update Issue: 3078. Thanks to Éric Chatellier. Resolved by athimel. o Check HibernateProvider#close method Issue: 3072. Thanks to Éric Chatellier. Resolved by athimel. o Non compiable code : getComposite use non visible association Issue: 2057. Thanks to Éric Chatellier. Resolved by bleny. o Unhandled 'null' value in collection when addIn is used in HqlAndParametersBuilder Issue: 3101. Thanks to Brendan Le Ny. Resolved by bleny. Changes: o Update to Hibernate 4.3.x Issue: 2969. Thanks to Arnaud Thimel. Resolved by athimel. o Re(use) tests that has been created in topia-3.0-jpa project Issue: 2774. Thanks to Arnaud Thimel. Resolved by athimel. 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-beta-1|jar Have fun! -ToPIA team

1 0

r3054 - in trunk: . topia-it topia-junit topia-persistence topia-service-csv topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 07 Apr '14

07 Apr '14

Author: maven-release Date: 2014-04-07 16:15:24 +0200 (Mon, 07 Apr 2014) New Revision: 3054 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3054 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-csv/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 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-beta-1</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -211,12 +211,12 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-1</connection> + <connection>scm:svn:https://svn.nuiton.org/topia/trunk</connection> <developerConnection> - scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-1 + scm:svn:https://svn.nuiton.org/topia/trunk </developerConnection> <url> - https://forge.nuiton.org/projects/topia/repository/show/tags/topia-3.0-beta… + https://forge.nuiton.org/projects/topia/repository/show/trunk </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/topia-it/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/topia-junit/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/topia-persistence/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-csv/pom.xml =================================================================== --- trunk/topia-service-csv/pom.xml 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/topia-service-csv/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-1</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 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/topia-service-migration/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-1</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 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/topia-service-replication/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2014-04-07 14:15:17 UTC (rev 3053) +++ trunk/topia-templates/pom.xml 2014-04-07 14:15:24 UTC (rev 3054) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r3053 - in tags: . topia-3.0-beta-1
by maven-release＠users.nuiton.org 07 Apr '14

07 Apr '14

Author: maven-release Date: 2014-04-07 16:15:17 +0200 (Mon, 07 Apr 2014) New Revision: 3053 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3053 Log: [maven-release-plugin] copy for tag topia-3.0-beta-1 Added: tags/topia-3.0-beta-1/ Property changes on: tags/topia-3.0-beta-1 ___________________________________________________________________ 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

r3052 - in trunk: . topia-it topia-junit topia-persistence topia-service-csv topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 07 Apr '14

07 Apr '14

Author: maven-release Date: 2014-04-07 16:15:08 +0200 (Mon, 07 Apr 2014) New Revision: 3052 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3052 Log: [maven-release-plugin] prepare release topia-3.0-beta-1 Modified: trunk/pom.xml trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-csv/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 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -211,12 +211,12 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/topia/trunk</connection> + <connection>scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-1</connection> <developerConnection> - scm:svn:https://svn.nuiton.org/topia/trunk + scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-1 </developerConnection> <url> - https://forge.nuiton.org/projects/topia/repository/show/trunk + https://forge.nuiton.org/projects/topia/repository/show/tags/topia-3.0-beta… </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/topia-it/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/topia-junit/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/topia-persistence/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-csv/pom.xml =================================================================== --- trunk/topia-service-csv/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/topia-service-csv/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/topia-service-migration/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/topia-service-replication/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) +++ trunk/topia-templates/pom.xml 2014-04-07 14:15:08 UTC (rev 3052) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-1</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r3051 - trunk
by athimel＠users.nuiton.org 07 Apr '14

07 Apr '14

Author: athimel Date: 2014-04-07 16:07:45 +0200 (Mon, 07 Apr 2014) New Revision: 3051 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3051 Log: Use mavenpom 5.0.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-07 09:14:45 UTC (rev 3050) +++ trunk/pom.xml 2014-04-07 14:07:45 UTC (rev 3051) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.5-SNAPSHOT</version> + <version>5.0.5</version> </parent> <artifactId>topia</artifactId>

1 0

r3050 - branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 07 Apr '14

07 Apr '14

Author: echatellier Date: 2014-04-07 11:14:45 +0200 (Mon, 07 Apr 2014) New Revision: 3050 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3050 Log: Fix double anti negation Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2014-04-04 14:43:22 UTC (rev 3049) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2014-04-07 09:14:45 UTC (rev 3050) @@ -137,7 +137,7 @@ generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); - generateBooleanGetMethods = TopiaGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, input); + generateBooleanGetMethods = !TopiaGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, input); if (generateInterface) {

1 0

r3049 - in trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence: . internal
by athimel＠users.nuiton.org 04 Apr '14

04 Apr '14

Author: athimel Date: 2014-04-04 16:43:22 +0200 (Fri, 04 Apr 2014) New Revision: 3049 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3049 Log: fixes #3141 Add method TopiaDao#forAll() Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-04-04 10:34:07 UTC (rev 3048) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-04-04 14:43:22 UTC (rev 3049) @@ -193,8 +193,15 @@ long count(); /** + * Creates a QueryBuilder without restriction + * * @since 3.0 */ + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forAll(); + + /** + * @since 3.0 + */ TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(Map<String, Object> properties); /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-04-04 10:34:07 UTC (rev 3048) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-04-04 14:43:22 UTC (rev 3049) @@ -371,6 +371,12 @@ } @Override + public InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forAll() { + InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = newQueryBuilder(); + return result; + } + + @Override public InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forProperties(Map<String, Object> properties) { HqlAndParametersBuilder<E> hqlAndParametersBuilder = getHqlForProperties(properties); InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = new InnerTopiaQueryBuilderAddCriteriaOrRunQueryStep<E>(this, hqlAndParametersBuilder);

1 0

r3048 - in trunk: src/site/rst topia-persistence/src/main/java/org/nuiton/topia/persistence/internal
by athimel＠users.nuiton.org 04 Apr '14

04 Apr '14

Author: athimel Date: 2014-04-04 12:34:07 +0200 (Fri, 04 Apr 2014) New Revision: 3048 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3048 Log: Add methods without Map<String, Object> args on mostly used methods Modified: trunk/src/site/rst/migrate_to_3.0.rst trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/HibernateProvider.java Modified: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst 2014-04-03 17:55:16 UTC (rev 3047) +++ trunk/src/site/rst/migrate_to_3.0.rst 2014-04-04 10:34:07 UTC (rev 3048) @@ -37,7 +37,7 @@ ToPIA nécessite des versions minimum de Eugene et Hibernate. Vous devez utiliser les version suivantes : * Eugene >= 2.7.3 - * Hibernate >= 4.2.1.Final + * Hibernate >= 4.3.5.Final Configuration du plugin Maven Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-04-03 17:55:16 UTC (rev 3047) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-04-04 10:34:07 UTC (rev 3048) @@ -484,6 +484,13 @@ return result; } + protected <K> K findAnyOrNull(String hql) { + Preconditions.checkNotNull(hql); + Map<String, Object> hqlParameters = Collections.emptyMap(); + K result = findAnyOrNull(hql, hqlParameters); + return result; + } + protected <K> K findAnyOrNull(String hql, Map<String, Object> hqlParameters) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); @@ -492,6 +499,13 @@ return result; } + protected <K> List<K> findAll(String hql) { + Preconditions.checkNotNull(hql); + Map<String, Object> hqlParameters = Collections.emptyMap(); + List<K> result = findAll(hql, hqlParameters); + return result; + } + protected <K> List<K> findAll(String hql, Map<String, Object> hqlParameters) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); @@ -499,6 +513,13 @@ return result; } + protected <K> List<K> find(String hql, int startIndex, int endIndex) { + Preconditions.checkNotNull(hql); + Map<String, Object> hqlParameters = Collections.emptyMap(); + List<K> result = find(hql, hqlParameters, startIndex, endIndex); + return result; + } + protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, int startIndex, int endIndex) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); @@ -533,12 +554,24 @@ return result; } + protected <K> Iterable<K> findAllLazy(String hql) { + Map<String, Object> hqlParameters = Collections.emptyMap(); + Iterable<K> result= findAllLazy(hql, hqlParameters); + return result; + } + protected <K> Iterable<K> findAllLazy(String hql, Map<String, Object> hqlParameters) { Iterable<K> result= findAllLazy(hql, hqlParameters, batchSize); return result; } + protected <K> Iterable<K> findAllLazy(String hql, int batchSize) { + Map<String, Object> hqlParameters = Collections.emptyMap(); + Iterable<K> result = findAllLazy(hql, hqlParameters, batchSize); + return result; + } + protected <K> Iterable<K> findAllLazy(String hql, Map<String, Object> hqlParameters, int batchSize) { Preconditions.checkNotNull(hql); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/HibernateProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/HibernateProvider.java 2014-04-03 17:55:16 UTC (rev 3047) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/HibernateProvider.java 2014-04-04 10:34:07 UTC (rev 3048) @@ -58,7 +58,7 @@ import com.google.common.collect.Lists; /** - * @author Arnaud Thimel : thimel(a)codelutin.com + * @author Arnaud Thimel (Code Lutin) */ public class HibernateProvider {

1 0