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

r1761 - in trunk: . src/site
by fdesbois＠users.nuiton.org 17 Jan '10

17 Jan '10

Author: fdesbois Date: 2010-01-17 20:25:07 +0100 (Sun, 17 Jan 2010) New Revision: 1761 Modified: trunk/pom.xml trunk/src/site/site_fr.xml Log: use last mavenpom version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 14:18:46 UTC (rev 1760) +++ trunk/pom.xml 2010-01-17 19:25:07 UTC (rev 1761) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0.1</version> </parent> <artifactId>topia</artifactId> @@ -188,8 +188,8 @@ <projectId>topia</projectId>  - <eugene.version>2.0.0-beta-3-SNAPSHOT</eugene.version> - <lutinutil.version>1.1.1</lutinutil.version> + <eugene.version>2.0.0-beta-3</eugene.version> + <lutinutil.version>1.1.3</lutinutil.version> <processor.version>1.0.2</processor.version> <i18n.version>1.0.1</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> @@ -199,8 +199,6 @@ <build> - <defaultGoal>install</defaultGoal> - <pluginManagement> <plugins> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-01-15 14:18:46 UTC (rev 1760) +++ trunk/src/site/site_fr.xml 2010-01-17 19:25:07 UTC (rev 1761) @@ -15,7 +15,7 @@ <body> <breadcrumbs> - <item name="${project.name}" href="index.html" /> + <item href="http://maven-site.nuiton.org/topia" name="${project.name}"/> </breadcrumbs> <menu name="Utilisateur">

1 0

r1760 - trunk
by fdesbois＠users.nuiton.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 15:18:46 +0100 (Fri, 15 Jan 2010) New Revision: 1760 Modified: trunk/pom.xml Log: Use eugene snapshot Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-15 00:28:43 UTC (rev 1759) +++ trunk/pom.xml 2010-01-15 14:18:46 UTC (rev 1760) @@ -188,7 +188,7 @@ <projectId>topia</projectId>  - <eugene.version>2.0.0-beta-2</eugene.version> + <eugene.version>2.0.0-beta-3-SNAPSHOT</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> <processor.version>1.0.2</processor.version> <i18n.version>1.0.1</i18n.version>

1 0

r1759 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 15 Jan '10

15 Jan '10

Author: fdesbois Date: 2010-01-15 01:28:43 +0100 (Fri, 15 Jan 2010) New Revision: 1759 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: Add show params on toString method Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-14 18:02:45 UTC (rev 1758) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-15 00:28:43 UTC (rev 1759) @@ -335,7 +335,7 @@ @Override public String toString() { - return fullQuery(); + return fullQuery() + "; (PARAMS : " + getParams() + ")"; } /**

1 0

r1758 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework main/java/org/nuiton/topia/generator test/java/org/nuiton/topiatest test/java/org/nuiton/topiatest/beangen test/xmi
by fdesbois＠users.nuiton.org 14 Jan '10

14 Jan '10

Author: fdesbois Date: 2010-01-14 19:02:45 +0100 (Thu, 14 Jan 2010) New Revision: 1758 Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Log: - [TopiaQuery] add method to get main alias - [BeanTransformer] Evol #203 : manage Impl generation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-13 18:33:02 UTC (rev 1757) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-14 18:02:45 UTC (rev 1758) @@ -387,6 +387,15 @@ } /** + * Return the mainAlias set from constructor. + * + * @return a String or null if no alias is set + */ + public String getMainAlias() { + return mainAlias; + } + + /** * Add a property to load when query is executed. * Used to avoid LazyInitializationException for property needed after closing context. * The property is a string like those in HQL query. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2010-01-13 18:33:02 UTC (rev 1757) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BeanTransformer.java 2010-01-14 18:02:45 UTC (rev 1758) @@ -20,6 +20,7 @@ */ package org.nuiton.topia.generator; +import java.net.URL; import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; @@ -59,21 +60,46 @@ } ObjectModelClass resultClass; + boolean isSuperClassSet = false; if (clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN)) { resultClass = createAbstractClass(clazz.getName(), clazz.getPackageName()); + + // Get name for Impl class + String implQualifiedName = clazz.getQualifiedName() + "Impl"; + String resourceName = "/" + implQualifiedName.replaceAll("\\.", "/"); + + // Do not generate Impl if operations exist : must have an Impl class in Resource created by developper + boolean hasOperations = !clazz.getAllOtherOperations(true).isEmpty() || !clazz.getOperations().isEmpty(); + + // Generate the Impl class if not already exist in classpath and no operation is defined in model + if(getClass().getResource(resourceName) == null && !hasOperations) { + String implName = clazz.getName() + "Impl"; + ObjectModelClass resultClassImpl = createClass(implName, clazz.getPackageName()); + // set the abstract resulClass as the resultClassImpl super class + setSuperClass(resultClassImpl, resultClass.getQualifiedName()); + isSuperClassSet = true; + } } else { resultClass = createClass(clazz.getName(), clazz.getPackageName()); } - + List<ObjectModelAttribute> attributes = (List<ObjectModelAttribute>) clazz.getAttributes(); createForDTO(resultClass, clazz, attributes); // Set superclass - Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); - if (j.hasNext()) { - ObjectModelClass p = j.next(); - setSuperClass(resultClass, p.getQualifiedName()); + if (!isSuperClassSet) { + Iterator<ObjectModelClass> j = clazz.getSuperclasses().iterator(); + if (j.hasNext()) { + ObjectModelClass p = j.next(); + String qualifiedName = p.getQualifiedName(); + // We want to set the inheritance to the implementation class of the father + // Ex for model : A -> B (a inherits B) we want : A -> BImpl -> B + if (clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_BEAN)) { + qualifiedName = p.getQualifiedName() + "Impl"; + } + setSuperClass(resultClass, qualifiedName); + } } // Add interfaces from inputModel Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java 2010-01-14 18:02:45 UTC (rev 1758) @@ -0,0 +1,29 @@ + +package org.nuiton.topiatest.beangen; + +import org.nuiton.topiatest.Product; + +/** + * RoueImpl + * + * Created: 14 janv. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class RoueImpl extends Roue { + + @Override + public void mount() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override + public Product getModel(String id) { + throw new UnsupportedOperationException("Not supported yet."); + } + +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/beangen/RoueImpl.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1757 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 13 Jan '10

13 Jan '10

Author: fdesbois Date: 2010-01-13 19:33:02 +0100 (Wed, 13 Jan 2010) New Revision: 1757 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: Add management for multiple values for a single param Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-10 23:16:09 UTC (rev 1756) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-13 18:33:02 UTC (rev 1757) @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -369,12 +370,12 @@ * Add a HQL parameter to the Query. * * @param id identification of the param in the query - * @param e value of the param + * @param paramValue value of the param * @return the TopiaQuery */ - public TopiaQuery<E> addParam(String id, Object e) { + public TopiaQuery<E> addParam(String id, Object paramValue) { getParams().add(id); - getParams().add(e); + getParams().add(paramValue); return this; } @@ -442,6 +443,7 @@ /** * Add an element to the query. The parameter will be automatically added. * The constraint is needed to determine what type of operation it is. + * Ex : add("boat", Op.EQ, boat) means -> boat = :boat. * * @param paramName the name of the parameter in the query (attribute of the entity) * @param constraint the operation concerned @@ -460,6 +462,9 @@ if (dot != -1) { valueName = paramName.substring(dot+1); } + if (getParams().contains(valueName)) { + valueName = valueName + "_" + RandomStringUtils.randomAlphanumeric(4); + } return valueName; } @@ -520,7 +525,7 @@ queryIn += paramName + " IN ("; int count = 1; for (Object value : values) { - String valueName = getValueName(paramName) + count; + String valueName = getValueName(paramName + count); if (count != 1) { queryIn += ", "; }

1 0

r1756 - trunk
by tchemit＠users.nuiton.org 10 Jan '10

10 Jan '10

Author: tchemit Date: 2010-01-11 00:16:09 +0100 (Mon, 11 Jan 2010) New Revision: 1756 Modified: trunk/pom.xml Log: use mavenpom4redmine Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 16:02:55 UTC (rev 1755) +++ trunk/pom.xml 2010-01-10 23:16:09 UTC (rev 1756) @@ -8,8 +8,8 @@  <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom</artifactId> - <version>1.1.4</version> + <artifactId>mavenpom4redmine</artifactId> + <version>2.0-SNAPSHOT</version> </parent> <artifactId>topia</artifactId>

1 0

r1755 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: fdesbois Date: 2010-01-07 17:02:55 +0100 (Thu, 07 Jan 2010) New Revision: 1755 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: Add comment Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-07 10:38:08 UTC (rev 1754) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-07 16:02:55 UTC (rev 1755) @@ -717,8 +717,12 @@ } List<E> results = new ArrayList<E>(); for (Object o : res) { + if (o == null) { + continue; + } if (o instanceof Object[]) { // If it's an array, we want only the first element wich is the entity wanted + // We know that the array have at least one element o = ((Object[])o)[0]; } if (!mainEntityClass.isAssignableFrom(o.getClass())) {

1 0

r1754 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: fdesbois Date: 2010-01-07 11:38:08 +0100 (Thu, 07 Jan 2010) New Revision: 1754 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: remove old comment Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-07 10:37:20 UTC (rev 1753) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-07 10:38:08 UTC (rev 1754) @@ -717,14 +717,6 @@ } List<E> results = new ArrayList<E>(); for (Object o : res) { - // FIXME-FD20090106 How to change this try/catch by a better solution to test if the object is an array -// try { -// Object[] tab = (Object[])o; -// // If it's an array, we want only the first element wich is the entity wanted -// o = tab[0]; -// } catch (ClassCastException eee) { -// // no need to do something here, the cast is to test if the Object is an array -// } if (o instanceof Object[]) { // If it's an array, we want only the first element wich is the entity wanted o = ((Object[])o)[0];

1 0

r1753 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: fdesbois Date: 2010-01-07 11:37:20 +0100 (Thu, 07 Jan 2010) New Revision: 1753 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java Log: Add managment for select with more than one properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-07 03:29:06 UTC (rev 1752) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-01-07 10:37:20 UTC (rev 1753) @@ -262,62 +262,72 @@ } } - /** - * Constructor of TopiaQuery with entityClass initialization. - * - * @param entityClass Class for an entity Query - */ protected TopiaQuery(Class<E> entityClass) { parentheses = true; mainEntityClass = entityClass; this.from = " FROM " + mainEntityClass.getName(); } - /** - * Constructor of TopiaQuery from a DAO - * - * @param dao DAO linked to the entity to threat - */ protected TopiaQuery(TopiaDAO<E> dao) { this(dao.getEntityClass()); this.dao = dao; } - /** - * Constructor of TopiaQuery with String form initialization. - * - * @param entityClass - * @param alias of the main entity in the query - */ protected TopiaQuery(Class<E> entityClass, String alias) { this(entityClass); this.mainAlias = alias; this.from += " " + alias; } - /** - * Constructor of TopiaQuery from a DAO with an Alias - * - * @param dao DAO linked to the entity to threat - * @param alias of the main entity in the query - */ protected TopiaQuery(TopiaDAO<E> dao, String alias) { this(dao.getEntityClass(), alias); this.dao = dao; } + /** + * Create a TopiaQuery with entityClass initialization. + * + * @param <T> entity type extends TopiaEntity + * @param entityClass Class for an entity Query + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(Class<T> entityClass) { return new TopiaQuery<T>(entityClass); } + /** + * Create a TopiaQuery from a DAO. + * + * @param <T> entity type in the dao extends TopiaEntity + * @param dao DAO linked to the entity to threat + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(TopiaDAO<T> dao) { return new TopiaQuery<T>(dao); } + /** + * Create a TopiaQuery with entityClass initialization and its Alias. The main entity will be automatically added to the select part of + * the query if it is needed. + * + * @param <T> entity type in the dao extends TopiaEntity + * @param entityClass Class for an entity Query + * @param alias of the main entity in the query + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(Class<T> entityClass, String alias) { return new TopiaQuery<T>(entityClass, alias); } + /** + * Create a TopiaQuery from a DAO with an Alias. The main entity will be automatically added to the select part of + * the query if it is needed. + * + * @param <T> entity type in the dao extends TopiaEntity + * @param dao DAO linked to the entity to threat + * @param alias of the main entity in the query + * @return the new TopiaQuery + */ public static <T extends TopiaEntity> TopiaQuery<T> createQuery(TopiaDAO<T> dao, String alias) { return new TopiaQuery<T>(dao, alias); } @@ -554,18 +564,38 @@ } /** - * Set the select in the query. Depends on the result wanted in execute methods. + * Add an element to the select in the query. Depends on the result wanted in execute methods. The main entity will be + * automatically added only if an alias is initialize from constructor. If you want only this select element, use {@link #setSelect(java.lang.String) } + * method instead. * * @param select element to add * @return the TopiaQuery */ + public TopiaQuery<E> addSelect(String select) { + // if select is the mainAlias, do nothing + if (mainAlias != null && select.equals(mainAlias)) { + return this; + } + // if select is not null, add the new element to the select + if (this.select != null) { + this.select += ", "; + // if mainAlias is not null, add it before adding the select in argument + } else if (mainAlias != null) { + this.select = mainAlias + ", "; + } else { + this.select = ""; + } + this.select += select; + return this; + } + + /** + * Set the select in the query. Depends on the result wanted in execute methods. + * + * @param select element to set + * @return the TopiaQuery + */ public TopiaQuery<E> setSelect(String select) { -// if (this.select == null) { -// this.select = "SELECT "; -// } else { -// this.select += ", "; -// } -// this.select += select; this.select = select; return this; } @@ -687,14 +717,29 @@ } List<E> results = new ArrayList<E>(); for (Object o : res) { - if (o != null && !mainEntityClass.isAssignableFrom(o.getClass())) { - throw new ClassCastException("Invalid cast for " + mainEntityClass.getName()); + // FIXME-FD20090106 How to change this try/catch by a better solution to test if the object is an array +// try { +// Object[] tab = (Object[])o; +// // If it's an array, we want only the first element wich is the entity wanted +// o = tab[0]; +// } catch (ClassCastException eee) { +// // no need to do something here, the cast is to test if the Object is an array +// } + if (o instanceof Object[]) { + // If it's an array, we want only the first element wich is the entity wanted + o = ((Object[])o)[0]; } + if (!mainEntityClass.isAssignableFrom(o.getClass())) { + throw new ClassCastException(o.getClass().getName() + " can't be cast to " + mainEntityClass.getName() + " o : " + o); + } E entity = (E)o; - if (!getPropertiesToLoad().isEmpty()) { - loadProperties(entity); + // Check distinct constraint for complex query where o is firstly an Object[] (potentially distinct results with existing entity to add) + if (! (distinct && results.contains(entity)) ) { + if (!getPropertiesToLoad().isEmpty()) { + loadProperties(entity); + } + results.add(entity); } - results.add(entity); } return results; } @@ -732,7 +777,7 @@ for (E elmt : executeToEntityList(transaction)) { Object value = loadProperty(elmt, keyName); if (value != null && !keyClass.isAssignableFrom(value.getClass())) { - throw new ClassCastException("Invalid cast for " + keyClass.getName()); + throw new ClassCastException(value.getClass().getName() + " can't be cast to " + keyClass.getName()); } results.put((K)value, elmt); }

1 0

r1752 - trunk
by tchemit＠users.nuiton.org 07 Jan '10

07 Jan '10

Author: tchemit Date: 2010-01-07 04:29:06 +0100 (Thu, 07 Jan 2010) New Revision: 1752 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 15:48:49 UTC (rev 1751) +++ trunk/pom.xml 2010-01-07 03:29:06 UTC (rev 1752) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4</version> </parent> <artifactId>topia</artifactId>

1 0