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

r3018 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by athimel＠users.nuiton.org Feb. 26, 2014

Feb. 26, 2014

Author: athimel Date: 2014-02-26 17:29:14 +0100 (Wed, 26 Feb 2014) New Revision: 3018 Url: http://nuiton.org/projects/topia/repository/revisions/3018 Log: typo 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-02-26 16:01:48 UTC (rev 3017) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-02-26 16:29:14 UTC (rev 3018) @@ -78,7 +78,7 @@ public void addEquals(String property, Object value) { Preconditions.checkArgument(StringUtils.isNotEmpty(property)); // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive types - // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type + // TODO brendan 02/10/13 if value is instanceof TopiaEntity, we can check type if (value == null) { addNull(property); } else { @@ -90,7 +90,7 @@ public void addNotEquals(String property, Object value) { Preconditions.checkArgument(StringUtils.isNotEmpty(property)); // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive types - // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type + // TODO brendan 02/10/13 if value is instanceof TopiaEntity, we can check type if (value == null) { addNotNull(property); } else { @@ -102,7 +102,7 @@ public void addIn(String property, Collection<?> values) { Preconditions.checkArgument(StringUtils.isNotEmpty(property)); Preconditions.checkNotNull(values); - // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type + // TODO brendan 02/10/13 if value is instanceof TopiaEntity, we can check type // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive String aliasedProperty = alias + "." + property; String hqlParameterName = putHqlParameterWithAvailableName(property, values); @@ -113,7 +113,7 @@ public void addNotIn(String property, Collection<?> values) { Preconditions.checkArgument(StringUtils.isNotEmpty(property)); Preconditions.checkNotNull(values); - // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type + // TODO brendan 02/10/13 if value is instanceof TopiaEntity, we can check type // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive String aliasedProperty = alias + "." + property; String hqlParameterName = putHqlParameterWithAvailableName(property, values);

1 0

r3017 - in trunk: . src/site
by tchemit＠users.nuiton.org Feb. 26, 2014

Feb. 26, 2014

Author: tchemit Date: 2014-02-26 17:01:48 +0100 (Wed, 26 Feb 2014) New Revision: 3017 Url: http://nuiton.org/projects/topia/repository/revisions/3017 Log: fixes #3099: updates mavenpom to 5.0 Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-26 15:18:05 UTC (rev 3016) +++ trunk/pom.xml 2014-02-26 16:01:48 UTC (rev 3017) @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.7</version> + <version>5.0</version> </parent> <artifactId>topia</artifactId> @@ -41,7 +41,7 @@ Tools for Portable and Independent Architecture : Framework de persistance et de distribution d'application. </description> - <url>http://maven-site.nuiton.org/topia</url> + <url>https://doc.nuiton.org/topia</url> <inceptionYear>2004</inceptionYear> <developers> @@ -211,17 +211,17 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <connection>scm:svn:https://svn.nuiton.org/topia/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/trunk + scm:svn:https://svn.nuiton.org/topia/trunk </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/trunk + https://forge.nuiton.org/projects/topia/repository/show/trunk </url> </scm> <distributionManagement> <site> - <id>${platform}</id> + <id>doc.${platform}</id> <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-02-26 15:18:05 UTC (rev 3016) +++ trunk/src/site/site_fr.xml 2014-02-26 16:01:48 UTC (rev 3017) @@ -69,7 +69,7 @@ name="ReStructuredText" img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="${mavenpomSiteCommonResourcesUrl}/jrst" name="JRst" + <logo href="http://doc.nuiton.org/jrst" name="JRst" img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" @@ -124,7 +124,7 @@ <menu ref="reports"/> <links> - <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Nuiton.org" href="https://forge.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links>

1 0

r3016 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/internal topia-persistence/src/test/java/org/nuiton/topia/persistence topia-templates/src/main/java/org/nuiton/topia/templates
by bleny＠users.nuiton.org Feb. 26, 2014

Feb. 26, 2014

Author: bleny Date: 2014-02-26 16:18:05 +0100 (Wed, 26 Feb 2014) New Revision: 3016 Url: http://nuiton.org/projects/topia/repository/revisions/3016 Log: fixes #3098 refactor generation of hql for addIn and addNotIn refs #2894 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.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-02-26 14:57:21 UTC (rev 3015) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-02-26 15:18:05 UTC (rev 3016) @@ -24,18 +24,17 @@ * #L% */ -import java.util.Arrays; -import java.util.Map; -import java.util.Set; - +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; +import java.util.Arrays; +import java.util.Collection; +import java.util.Map; +import java.util.Set; /** * A builder to create syntactically correct HQL and associated parameters given properties or after various constraint @@ -100,66 +99,26 @@ } } - public void addIn(String property, Iterable<?> values) { - addInOrNotIn(property, values, true); + public void addIn(String property, Collection<?> values) { + Preconditions.checkArgument(StringUtils.isNotEmpty(property)); + Preconditions.checkNotNull(values); + // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type + // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive + String aliasedProperty = alias + "." + property; + String hqlParameterName = putHqlParameterWithAvailableName(property, values); + String whereClause = aliasedProperty + " in (:" + hqlParameterName + ")"; + whereClauses.add(whereClause); } - public void addNotIn(String property, Iterable<?> values) { - addInOrNotIn(property, values, false); - } - - /** - * @param in true if property value must be in given collection, false if value must not be in given collection - */ - protected void addInOrNotIn(String property, Iterable<?> values, boolean in) { + public void addNotIn(String property, Collection<?> values) { Preconditions.checkArgument(StringUtils.isNotEmpty(property)); Preconditions.checkNotNull(values); // TODO brendan 02/10/13 if value is intanceof TopiaEntity, we can check type // TODO brendan 02/10/13 do not use HQL parameters of Object are primitive String aliasedProperty = alias + "." + property; - if (Iterables.size(values) == 1) { - // if there is only one possible value, replace "in" clause by a "=" clause - Object onlyElement = Iterables.getOnlyElement(values); - if (in) { - addEquals(property, onlyElement); - } else { - addNotEquals(property, onlyElement); - } - } else { - boolean propertyMayBeNull = false; // true if values contains null - Set<String> hqlParameterNames = Sets.newLinkedHashSet(); - for (Object value : values) { - if (value == null) { - propertyMayBeNull = true; - } else { - String hqlParameterName = putHqlParameterWithAvailableName(property, value); - hqlParameterNames.add(hqlParameterName); - } - } - String whereClause; - String inClauseValues; - if (hqlParameterNames.isEmpty()) { - inClauseValues = ""; - } else { - inClauseValues = ":" + StringUtils.join(hqlParameterNames, ", :"); - } - if (in) { - String inClause = aliasedProperty + " in (" + inClauseValues + ")"; - if (propertyMayBeNull) { - whereClause = aliasedProperty + " is null or " + inClause; - } else { - whereClause = inClause; - } - } else { - String inClause = aliasedProperty + " not in (" + inClauseValues + ")"; - if (propertyMayBeNull) { - whereClause = aliasedProperty + " is not null and " + inClause; - } else { - whereClause = inClause; - } - } - whereClauses.add(whereClause); - } + String hqlParameterName = putHqlParameterWithAvailableName(property, values); + String whereClause = aliasedProperty + " not in (:" + hqlParameterName + ")"; + whereClauses.add(whereClause); } public void addTopiaIdEquals(String property, String topiaId) { @@ -167,7 +126,7 @@ addEquals(property + "." + TopiaEntity.PROPERTY_TOPIA_ID, topiaId); } - public void addTopiaIdIn(String property, Iterable<String> topiaIds) { + public void addTopiaIdIn(String property, Collection<String> topiaIds) { addIn(property + "." + TopiaEntity.PROPERTY_TOPIA_ID, topiaIds); } @@ -176,8 +135,8 @@ addNotEquals(property + "." + TopiaEntity.PROPERTY_TOPIA_ID, topiaId); } - public void addTopiaIdNotIn(String property, Iterable<String> topiaIds) { - addNotIn(property + "." + TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds); + public void addTopiaIdNotIn(String property, Collection<String> topiaIds) { + addNotIn(property + "." + TopiaEntity.PROPERTY_TOPIA_ID, (Collection) topiaIds); } public void addContains(String property, Object value) { 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-02-26 14:57:21 UTC (rev 3015) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-02-26 15:18:05 UTC (rev 3016) @@ -24,14 +24,14 @@ * #L% */ -import java.util.List; -import java.util.Map; - +import com.google.common.base.Optional; import org.nuiton.topia.persistence.event.TopiaEntityListener; import org.nuiton.topia.persistence.event.TopiaEntityVetoable; import org.nuiton.topia.persistence.pager.TopiaPagerBean; -import com.google.common.base.Optional; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * This contract represents the common operations any Dao should be able to provide as API. @@ -222,7 +222,7 @@ /** * @since 3.0 */ - TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Iterable<?> propertyValues); + TopiaQueryBuilderRunQueryStep<E> forIn(String propertyName, Collection<?> propertyValues); /** * @since 3.0 @@ -255,7 +255,7 @@ /** * @since 3.0 */ - TopiaQueryBuilderRunQueryStep<E> forTopiaIdIn(Iterable<String> topiaIds); + TopiaQueryBuilderRunQueryStep<E> forTopiaIdIn(Collection<String> topiaIds); void addTopiaEntityListener(TopiaEntityListener listener); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2014-02-26 14:57:21 UTC (rev 3015) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2014-02-26 15:18:05 UTC (rev 3016) @@ -24,6 +24,7 @@ * #L% */ +import java.util.Collection; import java.util.Set; /** @@ -55,14 +56,14 @@ * a one-to-one or a many-to-one property * @param values the value the field of the entity must be equals to one of the given values */ - TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Iterable<?> values); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Collection<?> values); /** * @param property the name of a field of the queried entity, must be * a one-to-one or a many-to-one property * @param values the value the field of the entity must not be equals to any of the given values */ - TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotIn(String property, Iterable<?> values); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotIn(String property, Collection<?> values); /** * @param property the name of a field of the queried entity, must be @@ -100,11 +101,11 @@ */ TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdEquals(String property, String topiaId); - TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdIn(String property, Iterable<String> topiaIds); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdIn(String property, Collection<String> topiaIds); TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdNotEquals(String property, String topiaId); - TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdNotIn(String property, Iterable<String> topiaIds); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdNotIn(String property, Collection<String> topiaIds); TopiaQueryBuilderRunQueryStep<E> setOrderByArguments(Set<String> orderByArguments); 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-02-26 14:57:21 UTC (rev 3015) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-02-26 15:18:05 UTC (rev 3016) @@ -57,6 +57,7 @@ import org.nuiton.util.PagerBeanUtil; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -400,7 +401,7 @@ } @Override - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forIn(String propertyName, Iterable<?> propertyValues) { + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forIn(String propertyName, Collection<?> propertyValues) { TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = newQueryBuilder().addIn(propertyName, propertyValues); return result; } @@ -561,9 +562,9 @@ } @Override - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forTopiaIdIn(Iterable<String> topiaIds) { + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> forTopiaIdIn(Collection<String> topiaIds) { Preconditions.checkNotNull(topiaIds, "given topiaIds is null"); - TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forIn(TopiaEntity.PROPERTY_TOPIA_ID, (Iterable) topiaIds); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forIn(TopiaEntity.PROPERTY_TOPIA_ID, (Collection) topiaIds); return result; } @@ -749,13 +750,13 @@ } @Override - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Iterable<?> values) { + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addIn(String property, Collection<?> values) { hqlAndParametersBuilder.addIn(property, values); return this; } @Override - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotIn(String property, Iterable<?> values) { + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addNotIn(String property, Collection<?> values) { hqlAndParametersBuilder.addNotIn(property, values); return this; } @@ -791,7 +792,7 @@ } @Override - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdIn(String property, Iterable<String> topiaIds) { + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdIn(String property, Collection<String> topiaIds) { hqlAndParametersBuilder.addTopiaIdIn(property, topiaIds); return this; } @@ -803,7 +804,7 @@ } @Override - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdNotIn(String property, Iterable<String> topiaIds) { + public TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> addTopiaIdNotIn(String property, Collection<String> topiaIds) { hqlAndParametersBuilder.addTopiaIdNotIn(property, topiaIds); return this; } 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-02-26 14:57:21 UTC (rev 3015) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2014-02-26 15:18:05 UTC (rev 3016) @@ -81,20 +81,6 @@ } @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"); @@ -118,17 +104,6 @@ } @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()); @@ -136,28 +111,11 @@ String actualHql = hqlAndParametersBuilder.getHql(); Assert.assertFalse(actualHql.contains("myProp in (:)")); - Assert.assertTrue(actualHql.contains("myProp in ()")); + Assert.assertFalse(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"); Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-02-26 14:57:21 UTC (rev 3015) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-02-26 15:18:05 UTC (rev 3016) @@ -878,15 +878,17 @@ assocClassName + '.' + getConstantName(attrName); } + addImport(result, Collection.class); + ObjectModelOperation op; op = addOperation(result, getJavaBeanMethodName("for", attrName, "In"), "TopiaQueryBuilderAddCriteriaOrRunQueryStep<E>", ObjectModelJavaModifier.PUBLIC); - addParameter(op, "Iterable<" + attrTypeForGeneric + ">", "v"); + addParameter(op, "Collection<" + attrTypeForGeneric + ">", "v"); setOperationBody(op, "" /*{ - TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forIn(<%=propertyName%>, (Iterable) v); + TopiaQueryBuilderAddCriteriaOrRunQueryStep<E> result = forIn(<%=propertyName%>, (Collection) v); return result; }*/ );

1 0

r3015 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by bleny＠users.nuiton.org Feb. 26, 2014

Feb. 26, 2014

Author: bleny Date: 2014-02-26 15:57:21 +0100 (Wed, 26 Feb 2014) New Revision: 3015 Url: http://nuiton.org/projects/topia/repository/revisions/3015 Log: add some doc about how to use TopiaIdFactory Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java 2014-02-18 12:23:16 UTC (rev 3014) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java 2014-02-26 14:57:21 UTC (rev 3015) @@ -33,6 +33,9 @@ * <li>retrieves a class or random part from a given topiaId.</li> * </ul> * + * You may use {@link org.nuiton.topia.persistence.TopiaConfigurationConstants#CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME} + * in configuration to make topia use it. + * * @author bleny <leny(a)codelutin.com/> * @author tchemit <chemit(a)codelutin.com/> * @since 3.0

1 0

[ANN] - ToPIA 3.0-alpha-11 released
by nuiton.org Release Notification Feb. 18, 2014

Feb. 18, 2014

The ToPIA team is pleased to announce the topia-3.0-alpha-11 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 Add log when findByTopiaId(...) method is used with an invalid topiaId Issue: 3079. Thanks to Arnaud Thimel. Resolved by athimel. Fixed Bugs: o Generated mapping for a property of type enumeration with multiplicity is wrong Issue: 3085. Thanks to Brendan Le Ny. Resolved by bleny. o GeneratedXxxTopiaDao#getComposite(E) does not add the required imports Issue: 3070. 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-alpha-11|jar Have fun! -ToPIA team

1 0

r3014 - 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 Feb. 18, 2014

Feb. 18, 2014

Author: maven-release Date: 2014-02-18 13:23:16 +0100 (Tue, 18 Feb 2014) New Revision: 3014 Url: http://nuiton.org/projects/topia/repository/revisions/3014 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-02-18 12:23:07 UTC (rev 3013) +++ trunk/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-alpha-11</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -211,12 +211,12 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-11</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-11 + scm:svn:http://svn.nuiton.org/svn/topia/trunk </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-11 + http://nuiton.org/projects/topia/repository/show/trunk </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2014-02-18 12:23:07 UTC (rev 3013) +++ trunk/topia-it/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-11</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2014-02-18 12:23:07 UTC (rev 3013) +++ trunk/topia-junit/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-11</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-02-18 12:23:07 UTC (rev 3013) +++ trunk/topia-persistence/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-11</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-02-18 12:23:07 UTC (rev 3013) +++ trunk/topia-service-csv/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-11</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-02-18 12:23:07 UTC (rev 3013) +++ trunk/topia-service-migration/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-11</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-02-18 12:23:07 UTC (rev 3013) +++ trunk/topia-service-replication/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-11</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2014-02-18 12:23:07 UTC (rev 3013) +++ trunk/topia-templates/pom.xml 2014-02-18 12:23:16 UTC (rev 3014) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-alpha-11</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r3013 - in tags: . topia-3.0-alpha-11
by maven-release＠users.nuiton.org Feb. 18, 2014

Feb. 18, 2014

Author: maven-release Date: 2014-02-18 13:23:07 +0100 (Tue, 18 Feb 2014) New Revision: 3013 Url: http://nuiton.org/projects/topia/repository/revisions/3013 Log: [maven-release-plugin] copy for tag topia-3.0-alpha-11 Added: tags/topia-3.0-alpha-11/ Property changes on: tags/topia-3.0-alpha-11 ___________________________________________________________________ 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

r3012 - 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 Feb. 18, 2014

Feb. 18, 2014

Author: maven-release Date: 2014-02-18 13:23:04 +0100 (Tue, 18 Feb 2014) New Revision: 3012 Url: http://nuiton.org/projects/topia/repository/revisions/3012 Log: [maven-release-plugin] prepare release topia-3.0-alpha-11 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-02-17 10:36:58 UTC (rev 3011) +++ trunk/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -211,12 +211,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-11</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/trunk + scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-3.0-alpha-11 </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/trunk + http://nuiton.org/projects/topia/repository/show/tags/topia-3.0-alpha-11 </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2014-02-17 10:36:58 UTC (rev 3011) +++ trunk/topia-it/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2014-02-17 10:36:58 UTC (rev 3011) +++ trunk/topia-junit/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-02-17 10:36:58 UTC (rev 3011) +++ trunk/topia-persistence/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-csv/pom.xml =================================================================== --- trunk/topia-service-csv/pom.xml 2014-02-17 10:36:58 UTC (rev 3011) +++ trunk/topia-service-csv/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2014-02-17 10:36:58 UTC (rev 3011) +++ trunk/topia-service-migration/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2014-02-17 10:36:58 UTC (rev 3011) +++ trunk/topia-service-replication/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2014-02-17 10:36:58 UTC (rev 3011) +++ trunk/topia-templates/pom.xml 2014-02-18 12:23:04 UTC (rev 3012) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-alpha-11</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r3011 - trunk/topia-templates/src/main/java/org/nuiton/topia/templates
by bleny＠users.nuiton.org Feb. 17, 2014

Feb. 17, 2014

Author: bleny Date: 2014-02-17 11:36:58 +0100 (Mon, 17 Feb 2014) New Revision: 3011 Url: http://nuiton.org/projects/topia/repository/revisions/3011 Log: fixes #3085 Generated mapping for a property of type enumeration with multiplicity is wrong: fix mapping Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java 2014-02-14 09:02:16 UTC (rev 3010) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java 2014-02-17 10:36:58 UTC (rev 3011) @@ -644,6 +644,8 @@ String collType = TopiaGeneratorUtil.getNMultiplicityHibernateType(attr); String lazy = generateFromTagValue(HIBERNATE_ATTRIBUTE_LAZY, TopiaGeneratorUtil.getLazyTagValue(attr)); String attrColumn = TopiaGeneratorUtil.getDbName(attr); + boolean attrIsEnumeration = attr.getClassifier() != null + && attr.getClassifier().isEnum(); /*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=lazy%>node="<%=attrName%>"> <%=prefix%> <key column="OWNER"/> @@ -652,9 +654,30 @@ /*{<%=prefix%> <list-index/> }*/ } + + if (attrIsEnumeration) { + boolean useEnumerationName = TopiaGeneratorUtil.hasUseEnumerationNameTagValue(attr, model); +/*{<%=prefix%> <element column="<%=attrColumn%>" node="id"> +<%=prefix%> <type name="org.hibernate.type.EnumType"> +<%=prefix%> <param name="<%=org.hibernate.type.EnumType.ENUM%>"><%=attrType%></param> +}*/ + // if the user tuned the model to use name instead of + // ordinal to store the values, we must add a clause + if (useEnumerationName) { + String enumSQLType = String.valueOf(Types.VARCHAR); +/*{<%=prefix%>  +<%=prefix%> <param name="<%=org.hibernate.type.EnumType.TYPE%>"><%=enumSQLType%></param> +}*/ + } +/*{<%=prefix%> </type> +<%=prefix%> </element> +}*/ + } else { /*{<%=prefix%> <element type="<%=attrType%>" column="<%=attrColumn%>" node="id"/> -<%=prefix%> </<%=collType%>> }*/ + } +/*{<%=prefix%> </<%=collType%>> +}*/ } protected void generateHibernateManyToOne(Writer output,

1 0

r3010 - in trunk: . topia-it/src/test/java/org/nuiton/topia/it/legacy/framework topia-persistence/src/main/java/org/nuiton/topia/persistence/internal topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by athimel＠users.nuiton.org Feb. 14, 2014

Feb. 14, 2014

Author: athimel Date: 2014-02-14 10:02:16 +0100 (Fri, 14 Feb 2014) New Revision: 3010 Url: http://nuiton.org/projects/topia/repository/revisions/3010 Log: refs #2969 revert (again) update to Hibernate 4.3.x because of #3078 Modified: trunk/pom.xml trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/HibernateProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-12 21:52:42 UTC (rev 3009) +++ trunk/pom.xml 2014-02-14 09:02:16 UTC (rev 3010) @@ -241,9 +241,9 @@ <nuitonI18nVersion>3.0</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.3.1.Final</hibernateVersion> - <sl4jVersion>1.7.5</sl4jVersion> - <h2Version>1.3.174</h2Version> + <hibernateVersion>4.2.8.Final</hibernateVersion> + <sl4jVersion>1.7.6</sl4jVersion> + <h2Version>1.3.175</h2Version> <hamcrestVersion>1.3</hamcrestVersion> </properties> Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2014-02-12 21:52:42 UTC (rev 3009) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2014-02-14 09:02:16 UTC (rev 3010) @@ -36,11 +36,11 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.UnknownUnwrapTypeException; +import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.Stoppable; 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-02-12 21:52:42 UTC (rev 3009) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/HibernateProvider.java 2014-02-14 09:02:16 UTC (rev 3010) @@ -36,15 +36,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; import org.hibernate.service.Service; import org.hibernate.service.ServiceRegistry; +import org.hibernate.service.ServiceRegistryBuilder; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.Stoppable; import org.nuiton.topia.persistence.TopiaConfigurationConstants; import org.nuiton.topia.persistence.TopiaNotFoundException; @@ -216,8 +216,14 @@ * @see org.hibernate.service.ServiceRegistry#getService(Class) */ protected static <S extends Service> S getHibernateService(SessionFactory sessionFactory, Class<S> serviceClass) { - SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); - StandardServiceRegistry serviceRegistry = sessionFactoryOptions.getServiceRegistry(); + // Hibernate 4.2.x + SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) sessionFactory; + ServiceRegistryImplementor serviceRegistry = sessionFactoryImplementor.getServiceRegistry(); + +// // Hibernate 4.3.x +// SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); +// StandardServiceRegistry serviceRegistry = sessionFactoryOptions.getServiceRegistry() + S result = serviceRegistry.getService(serviceClass); return result; } @@ -240,13 +246,19 @@ if (hibernateSessionFactory == null) { - // init service registry - StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); Properties properties = getHibernateConfiguration().getProperties(); - StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); - hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(standardServiceRegistry); + // init service registry + // Hibernate 4.2.x + ServiceRegistryBuilder builder = new ServiceRegistryBuilder().applySettings(properties); + ServiceRegistry serviceRegistry = builder.buildServiceRegistry(); + hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(serviceRegistry); +// // Hibernate 4.3.x +// StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); +// StandardServiceRegistry standardServiceRegistry = builder.applySettings(properties).build(); +// hibernateSessionFactory = getHibernateConfiguration().buildSessionFactory(standardServiceRegistry); + // we can't reuse original serviceRegistry instance // we must call getServiceRegistry on factory to get a working one SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) hibernateSessionFactory; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java 2014-02-12 21:52:42 UTC (rev 3009) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java 2014-02-14 09:02:16 UTC (rev 3010) @@ -28,11 +28,11 @@ import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.internal.util.ReflectHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.hibernate.service.UnknownUnwrapTypeException; +import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.Configurable; import org.hibernate.service.spi.Stoppable; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java 2014-02-12 21:52:42 UTC (rev 3009) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java 2014-02-14 09:02:16 UTC (rev 3010) @@ -137,11 +137,12 @@ } } - @Override - public boolean requiresPostCommitHanding(EntityPersister persister) { - // TODO AThimel 17/12/13 I don't know what to return - return false; - } +// // Hibernate 4.3.x +// @Override +// public boolean requiresPostCommitHanding(EntityPersister persister) { +// // TODO AThimel 17/12/13 I don't know what to return +// return false; +// } /* Chargement */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java 2014-02-12 21:52:42 UTC (rev 3009) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java 2014-02-14 09:02:16 UTC (rev 3010) @@ -40,13 +40,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.cfg.Configuration; import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Table; +import org.hibernate.service.ServiceRegistry; +import org.hibernate.service.ServiceRegistryBuilder; +import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; import org.nuiton.topia.persistence.TopiaConfigurationConstants; @@ -492,9 +493,12 @@ return properties; } + /** + * Hibernate 4.2.x compatible Supplier<ConnectionProvider> + */ public static class ConnectionProviderSupplier implements Supplier<ConnectionProvider>, Closeable { - protected StandardServiceRegistry standardServiceRegistry; + protected ServiceRegistry serviceRegistry; protected ConnectionProvider connectionProvider; @@ -503,22 +507,22 @@ public ConnectionProviderSupplier(TopiaHibernateSupport topiaHibernateSupport) { inlineRegistry = false; SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); - SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); - this.standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); + SessionFactoryImplementor sessionFactoryImplementor = (SessionFactoryImplementor) sessionFactory; + serviceRegistry = sessionFactoryImplementor.getServiceRegistry(); } public ConnectionProviderSupplier(Configuration configuration) { inlineRegistry = true; - StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); Properties properties = configuration.getProperties(); - this.standardServiceRegistry = builder.applySettings(properties).build(); + ServiceRegistryBuilder builder = new ServiceRegistryBuilder().applySettings(properties); + this.serviceRegistry = builder.buildServiceRegistry(); } @Override public ConnectionProvider get() { if (connectionProvider == null) { - connectionProvider = standardServiceRegistry.getService(ConnectionProvider.class); + connectionProvider = serviceRegistry.getService(ConnectionProvider.class); } return connectionProvider; } @@ -526,8 +530,51 @@ @Override public void close() throws IOException { if (inlineRegistry) { - StandardServiceRegistryBuilder.destroy(standardServiceRegistry); + ServiceRegistryBuilder.destroy(serviceRegistry); } } } + +// /** +// * Hibernate 4.3.x compatible Supplier<ConnectionProvider> +// */ +// public static class ConnectionProviderSupplier implements Supplier<ConnectionProvider>, Closeable { +// +// protected StandardServiceRegistry standardServiceRegistry; +// +// protected ConnectionProvider connectionProvider; +// +// protected final boolean inlineRegistry; +// +// public ConnectionProviderSupplier(TopiaHibernateSupport topiaHibernateSupport) { +// inlineRegistry = false; +// SessionFactory sessionFactory = topiaHibernateSupport.getHibernateFactory(); +// SessionFactory.SessionFactoryOptions sessionFactoryOptions = sessionFactory.getSessionFactoryOptions(); +// this.standardServiceRegistry = sessionFactoryOptions.getServiceRegistry(); +// } +// +// public ConnectionProviderSupplier(Configuration configuration) { +// inlineRegistry = true; +// +// StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder(); +// Properties properties = configuration.getProperties(); +// this.standardServiceRegistry = builder.applySettings(properties).build(); +// } +// +// @Override +// public ConnectionProvider get() { +// if (connectionProvider == null) { +// connectionProvider = standardServiceRegistry.getService(ConnectionProvider.class); +// } +// return connectionProvider; +// } +// +// @Override +// public void close() throws IOException { +// if (inlineRegistry) { +// StandardServiceRegistryBuilder.destroy(standardServiceRegistry); +// } +// } +// } + }

1 0