[Topia-commits] 02/03: Set default TopiaIdFactory to 'FullyQualifiedNamePlusUuidTopiaIdFactory'

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 841c3332c7280043ca2595a87489d7412ace1797 Author: Arnaud Thimel <thimel@codelutin.com> Date: Mon Mar 30 10:49:15 2015 +0200 Set default TopiaIdFactory to 'FullyQualifiedNamePlusUuidTopiaIdFactory' --- .../org/nuiton/topia/persistence/TopiaConfigurationBuilder.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java index 5d8fb0e..a566461 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationBuilder.java @@ -1,11 +1,14 @@ package org.nuiton.topia.persistence; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.hibernate.cfg.AvailableSettings; +import org.nuiton.topia.persistence.internal.DefaultTopiaIdFactory; +import org.nuiton.topia.persistence.internal.FullyQualifiedNamePlusUuidTopiaIdFactory; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import org.nuiton.topia.persistence.jdbc.JdbcConfigurationBuilder; import org.nuiton.util.beans.Binder; @@ -129,7 +132,10 @@ public class TopiaConfigurationBuilder { result.setInitSchema(initSchema); // others - result.setTopiaIdFactoryClassName(configuration.get(CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME)); + String topiaIdFactoryClassName = MoreObjects.firstNonNull( + configuration.get(CONFIG_PERSISTENCE_TOPIA_ID_FACTORY_CLASS_NAME), + FullyQualifiedNamePlusUuidTopiaIdFactory.class.getName()); + result.setTopiaIdFactoryClassName(topiaIdFactoryClassName); result.setSchemaName(configuration.get(CONFIG_DEFAULT_SCHEMA)); // Hibernate -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.