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

r2760 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org July 13, 2013

July 13, 2013

Author: tchemit Date: 2013-07-13 15:16:04 +0200 (Sat, 13 Jul 2013) New Revision: 2760 Url: http://nuiton.org/projects/topia/repository/revisions/2760 Log: fixes #2755: Creating a schema should not droping it just before fixes #2756: Does not use hardcoded cast to hibernate implementation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-13 13:11:07 UTC (rev 2759) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-13 13:16:04 UTC (rev 2760) @@ -37,9 +37,9 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.cfg.Configuration; +import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.EventType; -import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.jdbc.Work; import org.hibernate.service.ServiceRegistry; import org.hibernate.service.ServiceRegistryBuilder; @@ -106,7 +106,7 @@ * <p/> * Created: 23 déc. 2005 16:58:50 * - * @author poussin <poussin(a)codelutin.com> + * @author bpoussin <poussin(a)codelutin.com> * @author tchemit <chemit(a)codelutin.com> * @author fdesbois <desbois(a)codelutin.com> * @version $Id$ @@ -473,8 +473,7 @@ showSchema = true; } getFiresSupport().firePreCreateSchema(this); - new SchemaExport(getHibernateConfiguration()).create(showSchema, - true); + new SchemaExport(getHibernateConfiguration()).execute(showSchema, true, false, true); getFiresSupport().firePostCreateSchema(this); } catch (HibernateException eee) { throw new TopiaException( @@ -537,7 +536,7 @@ // we can't reuse original serviceRegistry instance // we must call getServiceRegistry on factory to get a working one - ServiceRegistry serviceRegistryInit = ((SessionFactoryImpl)hibernateFactory).getServiceRegistry(); + ServiceRegistry serviceRegistryInit = ((SessionFactoryImplementor) hibernateFactory).getServiceRegistry(); EventListenerRegistry eventListenerRegistry = serviceRegistryInit.getService(EventListenerRegistry.class); TopiaFiresSupport.TopiaHibernateEvent listener = new TopiaFiresSupport.TopiaHibernateEvent(this);

1 0

r2759 - trunk/topia-persistence/src/main/java/org/nuiton/topia/event
by tchemit＠users.nuiton.org July 13, 2013

July 13, 2013

Author: tchemit Date: 2013-07-13 15:11:07 +0200 (Sat, 13 Jul 2013) New Revision: 2759 Url: http://nuiton.org/projects/topia/repository/revisions/2759 Log: fix javadoc Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java 2013-07-13 11:14:18 UTC (rev 2758) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/event/TopiaContextListener.java 2013-07-13 13:11:07 UTC (rev 2759) @@ -71,14 +71,14 @@ void postUpdateSchema(TopiaContextEvent event); /** - * Called after updateSchema call + * Called before restoreSchema call * * @param event event */ void preRestoreSchema(TopiaContextEvent event); /** - * Called after updateSchema call + * Called after restoreSchema call * * @param event event */

1 0

r2758 - in trunk: src/site/rst topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org July 13, 2013

July 13, 2013

Author: tchemit Date: 2013-07-13 13:14:18 +0200 (Sat, 13 Jul 2013) New Revision: 2758 Url: http://nuiton.org/projects/topia/repository/revisions/2758 Log: refs #2752: Add generics support on TopiaContext#find*() methods (add also on findUnique and findByTopiaId) fix migration doc Modified: trunk/src/site/rst/migrate_to_3.0.rst trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst 2013-07-12 08:40:11 UTC (rev 2757) +++ trunk/src/site/rst/migrate_to_3.0.rst 2013-07-13 11:14:18 UTC (rev 2758) @@ -38,6 +38,7 @@ ----------------------- * ToPIA utilise au minimum Eugene 2.6.4. + * ToPIA utilise au minimum Hibernate 4.2.1.Final. Renommage de variables ---------------------- @@ -69,6 +70,13 @@ Généricité ---------- -Les methodes TopiaContext#find() et TopiaContext#findAll() sont devenu génériques. Si le code -précédente réalisait un cast, il faut le supprimer car cela cause maintenant une erreur de -compilation. +Les methodes + + * TopiaContext#find(...) + * TopiaContext#findAll(...) + * TopiaContext#findUnique(...) + +sont devenu génériques. + +Si le code précédent réalisait un cast, il faut le supprimer car cela peut +causer maintenant une erreur de compilation. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-07-12 08:40:11 UTC (rev 2757) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-07-13 11:14:18 UTC (rev 2758) @@ -169,7 +169,7 @@ * @return the entity found or null if not * @throws TopiaException for errors on retrieving the entity */ - TopiaEntity findByTopiaId(String topiaId) throws TopiaException; + <E extends TopiaEntity> E findByTopiaId(String topiaId) throws TopiaException; /** * Permet de faire une requete HQL hibernate directement sur la base. @@ -211,7 +211,7 @@ * @throws TopiaException for any error during querying or if the the query * returns more than one result. */ - Object findUnique(String jpaql, Object... paramNamesAndValues) + <E> E findUnique(String jpaql, Object... paramNamesAndValues) throws TopiaException; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-12 08:40:11 UTC (rev 2757) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-13 11:14:18 UTC (rev 2758) @@ -918,13 +918,13 @@ /* -------------------- GLOBAL OPERATIONS ON SCHEMA ----------------------*/ @Override - public TopiaEntity findByTopiaId(String id) throws TopiaException { + public <E extends TopiaEntity> E findByTopiaId(String id) throws TopiaException { checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "findById")); - Class<TopiaEntity> entityClass = getTopiaIdFactory().getClassName(id); - TopiaDAO<TopiaEntity> dao = getDAO(entityClass); - TopiaEntity result = dao.findByTopiaId(id); + Class<E> entityClass = getTopiaIdFactory().getClassName(id); + TopiaDAO<E> dao = getDAO(entityClass); + E result = dao.findByTopiaId(id); return result; } @@ -994,12 +994,12 @@ } @Override - public Object findUnique(String hql, Object... paramNamesAndValues) + public <E> E findUnique(String hql, Object... paramNamesAndValues) throws TopiaException { checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "findUnique")); - List<?> results = find(hql, 0, 1, paramNamesAndValues); + List<E> results = find(hql, 0, 1, paramNamesAndValues); // If there is more than 1 result, throw an exception if (results.size() > 1) { @@ -1009,7 +1009,7 @@ } // otherwise return the first one, or null - Object result = null; + E result = null; if (!results.isEmpty()) { result = results.get(0); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-12 08:40:11 UTC (rev 2757) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-13 11:14:18 UTC (rev 2758) @@ -528,7 +528,7 @@ @Override public E findContains(String propertyName, Object property) throws TopiaException { - E find = (E)context.findUnique("from " + getEntityClass().getName() + + E find = context.findUnique("from " + getEntityClass().getName() + " WHERE :property in elements(" + propertyName + ")", "property", property); return find; } @@ -552,30 +552,28 @@ Object... others) throws TopiaException { Map<String, Object> properties = convertPropertiesArrayToMap(propertyName, propertyValue, others); - boolean result = false; try { Criteria criteria = createCriteria(FlushMode.AUTO); criteria.add(Restrictions.allEq(properties)); criteria.setProjection(Projections.rowCount()); Number count = (Number) criteria.uniqueResult(); - result = count.intValue() > 0; + boolean result = count.intValue() > 0; + return result; } catch (HibernateException eee) { throw new TopiaException(eee); } - return result; } @Override public long count() throws TopiaException { - long result = -1; try { Criteria criteria = createCriteria(FlushMode.AUTO); criteria.setProjection(Projections.rowCount()); - result = ((Number)criteria.uniqueResult()).longValue(); + long result = ((Number)criteria.uniqueResult()).longValue(); + return result; } catch (HibernateException eee) { throw new TopiaException(eee); } - return result; } /**

1 0

r2757 - trunk/src/site/rst
by tchemit＠users.nuiton.org July 12, 2013

July 12, 2013

Author: tchemit Date: 2013-07-12 10:40:11 +0200 (Fri, 12 Jul 2013) New Revision: 2757 Url: http://nuiton.org/projects/topia/repository/revisions/2757 Log: update migration guide Modified: trunk/src/site/rst/migrate_to_3.0.rst Modified: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst 2013-07-12 08:31:24 UTC (rev 2756) +++ trunk/src/site/rst/migrate_to_3.0.rst 2013-07-12 08:40:11 UTC (rev 2757) @@ -21,9 +21,24 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Migrer depuis ToPIA 2.x vers 3.0 ================================ +:: + + FIXME tchemit : dans ce guide je ne vois pas ce qui est obligatoire de faire ? + Y'a des choses qui restent compatibles ? Il faudrait explicitement dire ce + qu'il faut faire (ce document dans sa forme actuelle est plus un changelog + qu'un guide de migration...). + + On devrait plutôt avoir une section *choses incompatibles* ou *à faire*. + +Gestion des dépendances +----------------------- + + * ToPIA utilise au minimum Eugene 2.6.4. + Renommage de variables ---------------------- @@ -47,6 +62,10 @@ Le classe TopiaID est dépréciée, elle sera déplacée dans topia-service-security. Utilisez plutôt une référence vers une instance de TopiaIdFactory (disponible dans le TopiaContextImplementor et donc dans les DAOs). +:: + + FIXME tchemit : je ne suis pas convaincu par ça, le module security pour moi doit aussi être déprécié, donc la dernière phrase est caduc. + Généricité ----------

1 0

r2756 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/persistence topia-service-security/src/main/java/org/nuiton/topia/security/jaas
by echatellier＠users.nuiton.org July 12, 2013

July 12, 2013

Author: echatellier Date: 2013-07-12 10:31:24 +0200 (Fri, 12 Jul 2013) New Revision: 2756 Url: http://nuiton.org/projects/topia/repository/revisions/2756 Log: refs #2752: Add generics support on TopiaContext#find*() methods Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-12 08:12:26 UTC (rev 2755) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-12 08:31:24 UTC (rev 2756) @@ -536,7 +536,7 @@ @Override public List<E> findAllContains(String propertyName, Object property) throws TopiaException { - List<E> find = (List<E>)context.findAll("from " + getEntityClass().getName() + + List<E> find = context.findAll("from " + getEntityClass().getName() + " WHERE :property in elements(" + propertyName + ")", "property", property); return find; } Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java 2013-07-12 08:12:26 UTC (rev 2755) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/security/jaas/TopiaLoginModule.java 2013-07-12 08:31:24 UTC (rev 2756) @@ -148,9 +148,10 @@ // Force le rechargement des groupes d'où la non utilisation de // la méthode : user.getTopiaGroup() - Set<TopiaGroup> groups = new HashSet<TopiaGroup>(securityManager.getSecurityContext().findAll( + List<TopiaGroup> groupsList = securityManager.getSecurityContext().findAll( "select topiaGroup from " + TopiaGroup.class.getName() + - " topiaGroup join topiaGroup.topiaUser as topiaUser where topiaUser = :user", "user", user)); + " topiaGroup join topiaGroup.topiaUser as topiaUser where topiaUser = :user", "user", user); + Set<TopiaGroup> groups = new HashSet<TopiaGroup>(groupsList); if (groups != null) { for (TopiaGroup group : groups) {

1 0

r2755 - in trunk: src/site/rst topia-persistence/src/main/java/org/nuiton/topia topia-persistence/src/main/java/org/nuiton/topia/framework
by echatellier＠users.nuiton.org July 12, 2013

July 12, 2013

Author: echatellier Date: 2013-07-12 10:12:26 +0200 (Fri, 12 Jul 2013) New Revision: 2755 Url: http://nuiton.org/projects/topia/repository/revisions/2755 Log: fixes #2752: Add generics support on TopiaContext#find*() methods Modified: trunk/src/site/rst/migrate_to_3.0.rst trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst 2013-07-12 07:09:32 UTC (rev 2754) +++ trunk/src/site/rst/migrate_to_3.0.rst 2013-07-12 08:12:26 UTC (rev 2755) @@ -47,4 +47,9 @@ Le classe TopiaID est dépréciée, elle sera déplacée dans topia-service-security. Utilisez plutôt une référence vers une instance de TopiaIdFactory (disponible dans le TopiaContextImplementor et donc dans les DAOs). +Généricité +---------- +Les methodes TopiaContext#find() et TopiaContext#findAll() sont devenu génériques. Si le code +précédente réalisait un cast, il faut le supprimer car cela cause maintenant une erreur de +compilation. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-07-12 07:09:32 UTC (rev 2754) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2013-07-12 08:12:26 UTC (rev 2755) @@ -36,8 +36,6 @@ import java.beans.PropertyChangeListener; import java.io.File; -import java.io.Reader; -import java.io.Writer; import java.util.List; /** @@ -181,7 +179,7 @@ * @return La liste des resultats * @throws TopiaException si une erreur survient durant la requete */ - List findAll(String hql, Object... args) throws TopiaException; + <E> List<E> findAll(String hql, Object... args) throws TopiaException; /** * Permet de faire une requete HQL hibernate directement sur la base en @@ -195,7 +193,7 @@ * @return La liste des resultats * @throws TopiaException si une erreur survient durant la requete */ - List find(String hql, int startIndex, int endIndex, Object... args) + <E> List<E> find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-12 07:09:32 UTC (rev 2754) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2013-07-12 08:12:26 UTC (rev 2755) @@ -917,8 +917,6 @@ /* -------------------- GLOBAL OPERATIONS ON SCHEMA ----------------------*/ - - @SuppressWarnings({"unchecked"}) @Override public TopiaEntity findByTopiaId(String id) throws TopiaException { checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", @@ -931,7 +929,7 @@ } @Override - public List<?> findAll(String hql, Object... args) throws TopiaException { + public <E> List<E> findAll(String hql, Object... args) throws TopiaException { checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "findAll")); @@ -962,7 +960,7 @@ } @Override - public List<?> find(String hql, int startIndex, int endIndex, Object... args) + public <E> List<E> find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException { checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", "find"));

1 0

r2754 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org July 12, 2013

July 12, 2013

Author: tchemit Date: 2013-07-12 09:09:32 +0200 (Fri, 12 Jul 2013) New Revision: 2754 Url: http://nuiton.org/projects/topia/repository/revisions/2754 Log: fix javadoc typo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.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 2013-07-12 07:05:37 UTC (rev 2753) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2013-07-12 07:09:32 UTC (rev 2754) @@ -694,7 +694,7 @@ * @param actions encoded actions * @return la liste des permissions * @throws TopiaException if any pb while getting datas - * @deprecated since 2.6.14, {@link TopiaQuery} will be removed in version 3.0 + * @deprecated since 2.6.14, {@code TopiaQuery} will be removed in version 3.0 */ List<Permission> getRequestPermission(String topiaId, int actions) throws TopiaException;

1 0

r2753 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org July 12, 2013

July 12, 2013

Author: tchemit Date: 2013-07-12 09:05:37 +0200 (Fri, 12 Jul 2013) New Revision: 2753 Url: http://nuiton.org/projects/topia/repository/revisions/2753 Log: fixes #2751: Improve TopiaDAO create methods Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-11 16:43:58 UTC (rev 2752) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-12 07:05:37 UTC (rev 2753) @@ -315,12 +315,14 @@ @Override public E create(E entity) throws TopiaException { - // TODO EC-20100322 this code may be merged with other create() methods try { // first set topiaId + if (entity.getTopiaId() == null) { - String topiaId = getContext().getTopiaIdFactory().newTopiaId(entityClass, entity); - entity.setTopiaId(topiaId); + // only set id if not already on + String topiaId = getContext().getTopiaIdFactory().newTopiaId(entityClass, entity); + entity.setTopiaId(topiaId); + } if (entity instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable)entity; @@ -329,7 +331,7 @@ // save entity getSession().save(entity); - getContext().getFiresSupport().warnOnUpdateEntity(entity); + getContext().getFiresSupport().warnOnCreateEntity(entity); return entity; } catch (HibernateException eee) { throw new TopiaException(eee); @@ -338,24 +340,23 @@ @Override public E create(Object... properties) throws TopiaException { + + int propertiesLength = properties.length; + Preconditions.checkArgument(propertiesLength % 2 == 0, + "Wrong number of argument " + + propertiesLength + + ", you must have even number."); + Map<String, Object> map = new HashMap<String, Object>(); - Object propertyName = null; - Object value; - try { - for (int i = 0; i < properties.length; ) { - propertyName = properties[i++]; - value = properties[i++]; - map.put((String) propertyName, value); - } - } catch (ArrayIndexOutOfBoundsException eee) { - throw new IllegalArgumentException("Wrong number of argument " - + properties.length - + ", you must have even number. Last property name read: " - + propertyName); - } catch (ClassCastException eee) { - throw new IllegalArgumentException( - "Wrong argument type, wait property name as String and " + - "have " + propertyName.getClass().getName()); + for (int i = 0; i < propertiesLength; ) { + Object propertyName = properties[i++]; + Object value = properties[i++]; + Preconditions.checkArgument( + propertyName instanceof String, + "Argument at position [" + (i - 1) + "] " + + "shoud be a property name (says a String) but was " + + propertyName); + map.put((String) propertyName, value); } E result = create(map); @@ -389,22 +390,8 @@ "Can't put properties on new Object", eee); } - if (result.getTopiaId() == null) { - // tchemit 2013/07/11 : avant ce code était avant le block précédent, donc si on avait un topiaId on n'en regénérait pas un - // tchemit 2013/07/11 : donc je remet le même comportement qu'avant - String newTopiaId = getContext().getTopiaIdFactory().newTopiaId(entityClass, result); - result.setTopiaId(newTopiaId); - } - if (result instanceof TopiaEntityContextable) { - TopiaEntityContextable contextable = (TopiaEntityContextable)result; - contextable.setTopiaContext(getContext()); - } + create(result); - // on fait un save maintenant, car puisqu'on a creer l'entity au - // travers du DAO, on s'attend a l'avoir a disposition tout de - // suite pour les requetes sans avoir a faire un update dessus - getSession().save(result); - getContext().getFiresSupport().warnOnCreateEntity(result); return result; } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-07-11 16:43:58 UTC (rev 2752) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/NaturalIdTest.java 2013-07-12 07:05:37 UTC (rev 2753) @@ -92,9 +92,14 @@ // Note : this is possible to create an empty entity if the type // is primitive like 'int' which have a default value of '0' - } catch (PropertyValueException eee) { - Assert.assertEquals("naturalIdNotNull", eee.getPropertyName()); + } catch (TopiaException eee) { + Assert.assertNotNull(eee.getCause()); + Assert.assertTrue(eee.getCause() instanceof PropertyValueException); + Assert.assertEquals("naturalIdNotNull", ((PropertyValueException)eee.getCause()).getPropertyName()); } +// catch (PropertyValueException eee) { +// Assert.assertEquals("naturalIdNotNull", eee.getPropertyName()); +// } } @Test

1 0

r2752 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 18:43:58 +0200 (Thu, 11 Jul 2013) New Revision: 2752 Url: http://nuiton.org/projects/topia/repository/revisions/2752 Log: refs #2083: Refactor topiaId generation (reproduce previous behaviour) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-11 16:27:47 UTC (rev 2751) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-11 16:43:58 UTC (rev 2752) @@ -389,9 +389,12 @@ "Can't put properties on new Object", eee); } - String newTopiaId = getContext().getTopiaIdFactory().newTopiaId(entityClass, result); - result.setTopiaId(newTopiaId); - + if (result.getTopiaId() == null) { + // tchemit 2013/07/11 : avant ce code était avant le block précédent, donc si on avait un topiaId on n'en regénérait pas un + // tchemit 2013/07/11 : donc je remet le même comportement qu'avant + String newTopiaId = getContext().getTopiaIdFactory().newTopiaId(entityClass, result); + result.setTopiaId(newTopiaId); + } if (result instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable)result; contextable.setTopiaContext(getContext());

1 0

r2751 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 18:27:47 +0200 (Thu, 11 Jul 2013) New Revision: 2751 Url: http://nuiton.org/projects/topia/repository/revisions/2751 Log: yet add another comment 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 2013-07-11 16:27:29 UTC (rev 2750) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java 2013-07-11 16:27:47 UTC (rev 2751) @@ -11,6 +11,7 @@ <E extends TopiaEntity> String newTopiaId(Class<E> entityClass, TopiaEntity topiaEntity); // TODO brendan 10/07/13 deprecated ? + // TODO tchemit 11/07/13, We still use this paradigm in Topia, prefer not to remove this contract ? @Deprecated <E extends TopiaEntity> Class<E> getClassName(String topiaId);

1 0