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

r1917 - trunk/topia-persistence/src/site/rst
by fdesbois＠users.nuiton.org April 29, 2010

April 29, 2010

Author: fdesbois Date: 2010-04-29 23:56:04 +0200 (Thu, 29 Apr 2010) New Revision: 1917 Url: http://nuiton.org/repositories/revision/topia/1917 Log: Add some infos in documentation Modified: trunk/topia-persistence/src/site/rst/TopiaQuery.rst Modified: trunk/topia-persistence/src/site/rst/TopiaQuery.rst =================================================================== --- trunk/topia-persistence/src/site/rst/TopiaQuery.rst 2010-04-29 19:21:12 UTC (rev 1916) +++ trunk/topia-persistence/src/site/rst/TopiaQuery.rst 2010-04-29 21:56:04 UTC (rev 1917) @@ -137,6 +137,7 @@ - TopiaQuery.Op.LE : Opérateur <= - TopiaQuery.Op.NOT_NULL : Opérateur IS NOT NULL - TopiaQuery.Op.NULL : Opérateur IS NULL +- TopiaQuery.Op.NEQ : Opérateur != Autres parties de la requête ---------------------------- @@ -293,7 +294,7 @@ Plusieurs méthodes sont disponibles pour récupérer les résultats de la requête. Pour chaque méthode, il est possible de l'appeler avec en paramètre le contexte -topia ou directement si la requête a été instancié avec un DAO qui contient +topia ou directement, si la requête a été instancié avec un DAO qui contient lui même le contexte. La méthode de base est la méthode execute() qui renvoie une liste non typé à l'instar de la méthode find(...) du TopiaContext. Il est cependant possible de récupérer directement un objet, un entier (pour @@ -304,12 +305,17 @@ SELECT d'origine pour pouvoir être par exemple executé de façon différente par la suite. +Note + Si la requête contient un DISTINCT (via la méthode addDistinct()), le + executeCount() gèrera automatiquement la contrainte sur la requête : + "SELECT COUNT(DISTINCT B) FROM Boat B ..." + Limitation des résultats ~~~~~~~~~~~~~~~~~~~~~~~~ Il est possible de limiter le nombre de résultats lors de l'exécution pour -optimiser la requête pour une pagination par exemple. Pour ce faire il faut -utiliser les méthodes **setLimit(int start, int end)** et/ou +optimiser la requête dans le cas d'une pagination par exemple. Pour ce faire +il faut utiliser les méthodes **setLimit(int start, int end)** et/ou **setMaxResults(int max)** :: // 18 premiers résultats

1 0

r1916 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org April 29, 2010

April 29, 2010

Author: fdesbois Date: 2010-04-29 21:21:12 +0200 (Thu, 29 Apr 2010) New Revision: 1916 Url: http://nuiton.org/repositories/revision/topia/1916 Log: Ano #560 : add distinct case for topiaQuery executeCount + clean some javadoc and reformat for 80chars Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 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-04-29 05:57:59 UTC (rev 1915) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-04-29 19:21:12 UTC (rev 1916) @@ -318,7 +318,8 @@ * @param mainEntityClass * @param alias for the mainEntityClass */ - public TopiaQuery(Class<? extends TopiaEntity> mainEntityClass, String alias) { + public TopiaQuery(Class<? extends TopiaEntity> mainEntityClass, + String alias) { this(); setFrom(mainEntityClass, alias); } @@ -367,7 +368,8 @@ * @param alias for the entity in the query * @return the TopiaQuery */ - public TopiaQuery setFrom(Class<? extends TopiaEntity> mainEntityClass, String alias) { + public TopiaQuery setFrom(Class<? extends TopiaEntity> mainEntityClass, + String alias) { setFrom(mainEntityClass); mainAlias = alias; from.append(' ').append(alias); @@ -403,85 +405,12 @@ * @param alias of the entity in the query * @return the TopiaQuery */ - public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass, String alias) { + public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass, + String alias) { return addFrom(entityClass.getName() + " " + alias); } /** - * Create a TopiaQuery with entityClass initialization. - * - * @param <T> entity type extends TopiaEntity - * @param entityClass Class for an entity Query - * @return the new TopiaQuery - * @deprecated use constructor instead : - * {@link #TopiaQuery(TopiaDAO) } - */ - @Deprecated - public static <T extends TopiaEntity> TopiaQuery createQuery(Class<T> entityClass) { - return new TopiaQuery(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 - * @deprecated use constructor instead : - * {@link #TopiaQuery(TopiaDAO) } - */ - @Deprecated - public static <T extends TopiaEntity> TopiaQuery createQuery(TopiaDAO<T> dao) { - return new TopiaQuery(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 - * @deprecated use constructor instead : - * {@link #TopiaQuery(Class, String) } - */ - @Deprecated - public static <T extends TopiaEntity> TopiaQuery createQuery(Class<T> entityClass, String alias) { - return new TopiaQuery(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 - * @deprecated use constructor instead : - * {@link #TopiaQuery(TopiaDAO, String) java.lang.Class) } - */ - @Deprecated - public static <T extends TopiaEntity> TopiaQuery createQuery(TopiaDAO<T> dao, String alias) { - return new TopiaQuery(dao, alias); - } - - @Override - public String toString() { - StringBuilder result = new StringBuilder(fullQuery()). - append("; (PARAMS : "). - append(getParams()). - append("); (LIMIT : "). - append(startIndex). - append(", "). - append(endIndex). - append(')'); - return result.toString(); -// return fullQuery() + "; (PARAMS : " + getParams() + "); (LIMIT : " + startIndex + ", " + endIndex + ")"; - } - - /** * Get the full query. * * @return a String corresponding to the full query. @@ -659,7 +588,8 @@ * ...) * @return the TopiaQuery */ - public TopiaQuery addNullOr(String paramName, Op constraint, Object paramValue) { + public TopiaQuery addNullOr(String paramName, Op constraint, + Object paramValue) { String valueName = getValueName(paramName); StringBuilder result = new StringBuilder(paramName).append(' ').append(Op.NULL). @@ -758,30 +688,6 @@ } /** - * Add an element to the query with a list of different values. The IN key - * word will be used to set the different values. An other constraint on - * nullity can be set with isNull argument. - * The element can have one of the value from the collection or can be null - * if the isNull argument is true. - * - * @param paramName name of the parameter in the query - * @param values different values for this parameter - * @param isNull use it to test the nullity of parameter - * @return the TopiaQuery - * @see #add(String) - * @deprecated use {@link #add(String, Object...) } - * with a null or not - */ - @Deprecated - public TopiaQuery add(String paramName, Collection<Object> values, - boolean isNull) { - if (isNull) { - values.add(null); - } - return add(paramName, values.toArray()); - } - - /** * Add a map of properties to the where clause of the query. Each property * will be added to the query with Op.EQ operation, the key in the map is * the property name, and the value is the value of the parameter in the @@ -805,6 +711,7 @@ * @param propertyA contains in propertyB collection * @param propertyB collection which contains propertyA * @return the TopiaQuery + * @since 2.4 */ public TopiaQuery addInElements(String propertyA, String propertyB) { StringBuilder builder = new StringBuilder(propertyA). @@ -970,13 +877,11 @@ public List execute(TopiaContext transaction) throws TopiaException { String query = fullQuery(); if (log.isDebugEnabled()) { - log.debug("# QUERY : " + query); - if (params != null) { - log.debug("# PARAMS : " + Arrays.toString(params.toArray())); - } + log.debug(this); } if (startIndex != null && endIndex != null) { - return transaction.find(query, startIndex, endIndex, getParams().toArray()); + return transaction.find(query, startIndex, endIndex, + getParams().toArray()); } return transaction.find(query, getParams().toArray()); } @@ -995,8 +900,7 @@ /** * Execute the query and get a List of entity. Some properties will be - * loaded if they are - * prealably set using ${@link #addLoad(String...) }. + * loaded if they are prealably set using ${@link #addLoad(String...) }. * * @param <E> * @param transaction the TopiaContext to use for execution @@ -1005,7 +909,8 @@ * @throws TopiaException * @throws ClassCastException */ - public <E extends TopiaEntity> List<E> executeToEntityList(TopiaContext transaction, Class<E> entityClass) + public <E extends TopiaEntity> List<E> executeToEntityList( + TopiaContext transaction, Class<E> entityClass) throws TopiaException, ClassCastException { List res = execute(transaction); if (log.isTraceEnabled()) { @@ -1023,7 +928,9 @@ o = ((Object[])o)[0]; } if (!entityClass.isAssignableFrom(o.getClass())) { - throw new ClassCastException(o.getClass().getName() + " can't be cast to " + entityClass.getName() + " o : " + o); + throw new ClassCastException(o.getClass().getName() + + " can't be cast to " + entityClass.getName() + + " o : " + o); } E entity = (E)o; // Check distinct constraint for complex query where o is firstly an @@ -1039,24 +946,6 @@ } /** - * DAO must be defined to use this method. - * - * @param <E> - * @return a List of TopiaEntity corresponding to the entityClass in argument - * @throws TopiaException - * @throws ClassCastException - * @see #executeToEntityList(TopiaContext,Class) - * @deprecated use dao method instead : - * {@link TopiaDAO#findAllByQuery(TopiaQuery) } - */ - @Deprecated - public <E extends TopiaEntity> List<E> executeToEntityList() - throws TopiaException, ClassCastException { - validateDAO(); - return (List<E>)dao.findAllByQuery(this); - } - - /** * Execute the query and get a Map of entity with key type in argument. Some * properties will be loaded if they are * prealably set using ${@link #addLoad(String...) }. @@ -1071,16 +960,20 @@ * @throws TopiaException * @throws ClassCastException */ - public <E extends TopiaEntity, K> Map<K, E> executeToEntityMap(TopiaContext transaction, Class<E> entityClass, String keyName, Class<K> keyClass) + public <E extends TopiaEntity, K> Map<K, E> executeToEntityMap( + TopiaContext transaction, Class<E> entityClass, + String keyName, Class<K> keyClass) throws TopiaException, ClassCastException { - // Use LinkedHashMap to keep insert order from list results which can be ordered + // Use LinkedHashMap to keep insert order from list results which + // can be ordered Map<K, E> results = new LinkedHashMap<K, E>(); List<E> list = executeToEntityList(transaction, entityClass); for (E elmt : list) { Object value = loadProperty(elmt, keyName); if (value != null && !keyClass.isAssignableFrom(value.getClass())) { - throw new ClassCastException(value.getClass().getName() + " can't be cast to " + keyClass.getName()); + throw new ClassCastException(value.getClass().getName() + + " can't be cast to " + keyClass.getName()); } results.put((K)value, elmt); } @@ -1088,27 +981,6 @@ } /** - * DAO must be defined to use this method. - * - * @param <E> - * @param <K> - * @param keyName - * @param keyClass - * @return a Map with the key type defined and the entity in value - * @throws TopiaException - * @throws ClassCastException - * @see #executeToEntityMap(TopiaContext, Class) - * @deprecated use dao method instead : - * {@link TopiaDAO#findAllMappedByQuery(TopiaQuery, String, Class) } - */ - @Deprecated - public <E extends TopiaEntity, K> Map<K, E> executeToEntityMap(String keyName, Class<K> keyClass) - throws TopiaException, ClassCastException { - validateDAO(); - return (Map<K, E>)dao.findAllMappedByQuery(this, keyName, keyClass); - } - - /** * Execute the query and get a Map of entity with topiaId in key. Some * properties will be loaded if they are * prealably set using ${@link #addLoad(String...) }. @@ -1120,30 +992,14 @@ * @throws TopiaException * @throws ClassCastException */ - public <E extends TopiaEntity> Map<String, E> executeToEntityMap(TopiaContext transaction, Class<E> entityClass) + public <E extends TopiaEntity> Map<String, E> executeToEntityMap( + TopiaContext transaction, Class<E> entityClass) throws TopiaException, ClassCastException { - return executeToEntityMap(transaction, entityClass, TopiaEntity.TOPIA_ID, String.class); + return executeToEntityMap(transaction, entityClass, + TopiaEntity.TOPIA_ID, String.class); } /** - * DAO must be defined to use this method. - * - * @param <E> - * @return a Map with the key type defined and the entity in value - * @throws TopiaException - * @throws ClassCastException - * @see #executeToEntityMap(TopiaContext,Class) - * @deprecated use dao method instead : - * {@link TopiaDAO#findAllMappedByQuery(TopiaQuery) } - */ - @Deprecated - public <E extends TopiaEntity> Map<String, E> executeToEntityMap() - throws TopiaException, ClassCastException { - validateDAO(); - return (Map<String, E>)dao.findAllMappedByQuery(this); - } - - /** * Execute the query and get the first result entity. Some properties will * be loaded if they are * prealably set using ${@link #addLoad(String...) }. @@ -1155,7 +1011,8 @@ * @throws TopiaException * @throws ClassCastException */ - public <E extends TopiaEntity> E executeToEntity(TopiaContext transaction, Class<E> entityClass) + public <E extends TopiaEntity> E executeToEntity(TopiaContext transaction, + Class<E> entityClass) throws TopiaException, ClassCastException { setMaxResults(1); List<E> results = executeToEntityList(transaction, entityClass); @@ -1164,25 +1021,6 @@ } /** - * DAO must be defined to use this method. - * - * @param <E> - * @return a TopiaEntity corresponding to the entityClass in argument - * @throws TopiaException - * @throws ClassCastException - * @see #executeToEntity(TopiaContext,Class) - * @deprecated use dao method instead : - * {@link TopiaDAO#findByQuery(TopiaQuery) } - */ - @Deprecated - public <E extends TopiaEntity> E executeToEntity() - throws TopiaException, ClassCastException { - validateDAO(); - //return executeToEntity(dao.getContext()); - return (E)dao.findByQuery(this); - } - - /** * Execute the query and get an Object for result. * The select is overriden to get only the right value for return. * @@ -1191,7 +1029,8 @@ * @return an Object * @throws TopiaException */ - public Object executeToObject(TopiaContext transaction, String select) throws TopiaException { + public Object executeToObject(TopiaContext transaction, String select) + throws TopiaException { StringBuilder oldValue = this.select; if (!StringUtils.isEmpty(select)) { setSelect(select); @@ -1217,7 +1056,8 @@ * @return an Integer * @throws TopiaException */ - public int executeToInteger(TopiaContext transaction, String select) throws TopiaException { + public int executeToInteger(TopiaContext transaction, String select) + throws TopiaException { Long res = (Long)executeToObject(transaction, select); return res != null ? res.intValue() : 0; } @@ -1244,7 +1084,8 @@ * @return a String * @throws TopiaException */ - public String executeToString(TopiaContext transaction, String select) throws TopiaException { + public String executeToString(TopiaContext transaction, String select) + throws TopiaException { Object res = executeToObject(transaction, select); return res != null ? (String)res : ""; } @@ -1277,7 +1118,12 @@ /** * Execute a simple count on the query, i.e. the number of results get from - * the query. The order is not considered to count the elements. + * the query. The order is not considered to count the elements and will + * be temporarly disabled. The distinct constraint will be manage if + * necessary : + * <pre> + * COUNT(DISTINCT mainAlias) + * </pre> * * @param transaction the TopiaContext to use for execution * @return an int corresponding to the number of result in the query @@ -1286,7 +1132,18 @@ public int executeCount(TopiaContext transaction) throws TopiaException { StringBuilder oldOrder = orderBy; orderBy = null; - int result = executeToInteger(transaction, "COUNT(*)"); + StringBuilder count = new StringBuilder("COUNT("); + // Ano #560 : manage distinct case when the alias is set (otherwise + // no need the distinct keyword because the entity type in query is + // unique) + if (distinct && StringUtils.isNotEmpty(mainAlias)) { + count.append("DISTINCT ").append(mainAlias); + // When distinct is not set, use * + } else { + count.append('*'); + } + count.append(')'); + int result = executeToInteger(transaction, count.toString()); orderBy = oldOrder; return result; } @@ -1307,7 +1164,7 @@ if (dao == null) { throw new TopiaException("DAO not defined in TopiaQuery, " + "can't execute it without TopiaContext"); - } + } return true; } @@ -1318,7 +1175,8 @@ * @param entity used to load properties * @throws TopiaException */ - protected <T extends TopiaEntity> void loadProperties(T entity) throws TopiaException { + protected <T extends TopiaEntity> void loadProperties(T entity) + throws TopiaException { for (String prop : getPropertiesToLoad()) { if (log.isTraceEnabled()) { log.trace("load property " + prop + " ..."); @@ -1329,7 +1187,8 @@ while (it.hasNext()) { String s = it.next(); if (log.isTraceEnabled()) { - log.trace("Current entity : " + currEntity.getClass().getSimpleName()); + log.trace("Current entity : " + + currEntity.getClass().getSimpleName()); log.trace("Current loading : " + s); } if (it.hasNext()) { @@ -1350,7 +1209,8 @@ * @return a TopiaEntity corresponding to the property loaded * @throws TopiaException */ - protected <T extends TopiaEntity> TopiaEntity loadEntityProperty(T entity, String property) throws TopiaException { + protected <T extends TopiaEntity> TopiaEntity loadEntityProperty(T entity, + String property) throws TopiaException { return (TopiaEntity)loadProperty(entity, property); } @@ -1363,11 +1223,13 @@ * @return an Object corresponding to the property loaded * @throws TopiaException */ - protected <T extends TopiaEntity> Object loadProperty(T entity, String property) throws TopiaException { + protected <T extends TopiaEntity> Object loadProperty(T entity, + String property) throws TopiaException { try { Object res = PropertyUtils.getProperty(entity, property); if (log.isTraceEnabled()) { - log.trace("load property '" + property + "' for '" + entity.getClass().getSimpleName() + "'"); + log.trace("load property '" + property + "' for '" + + entity.getClass().getSimpleName() + "'"); } if (res != null && Collection.class.isAssignableFrom(res.getClass())) { Collection<?> list = (Collection<?>) res; @@ -1375,35 +1237,35 @@ } return res; } catch (IllegalAccessException eee) { - throw new TopiaException("Illegal access on property " + property + " from entity " + entity.getClass().getName(), eee); + throw new TopiaException("Illegal access on property " + + property + " from entity " + + entity.getClass().getName(), eee); } catch (InvocationTargetException eee) { - throw new TopiaException("Invocation error on entity " + entity.getClass().getName() + " for property " + property, eee); + throw new TopiaException("Invocation error on entity " + + entity.getClass().getName() + " for property " + + property, eee); } catch (NoSuchMethodException eee) { - throw new TopiaException("Getter method does not exist for property " + property + " from entity " + entity.getClass().getName(), eee); + throw new TopiaException("Getter method does not exist for" + + " property " + property + " from entity " + + entity.getClass().getName(), eee); } } - @Override - protected void finalize() { - // Clean StringBuilder statements - select = null; - from = null; - where = null; - orderBy = null; - groupBy = null; - } - /** * This method is used to concat properties from entities. Ex in HQL you * can have boat.shipOwner.name, these properties are defined as constants * in each entity associated (SHIP_OWNER in Boat entity, NAME in ShipOwner * entity) so you just have to call this method as : - * getProperty("boat", Boat.SHIP_OWNER, ShipOwner.NAME); to have the - * correct property to use : boat.shipOwner.name. It's better to use - * constants instead of directly the string chain to avoid problems on - * changing property name in model. Furthermore it's better to use this - * method instead of doing : + * <pre> + * getProperty("boat", Boat.SHIP_OWNER, ShipOwner.NAME); + * // will return boat.shipOwner.name + * </pre><br \> + * It's better to use constants instead of directly the string chain to + * avoid problems on changing property name in model. Furthermore it's + * better to use this method instead of doing : + * <pre> * "boat." + Boat.SHIP_OWNER + "." + ShipOwner.NAME + * </pre> * * @param entityProperty to concat * @return the string chain with properties separated with a dot @@ -1414,4 +1276,27 @@ return result; } + @Override + protected void finalize() { + // Clean StringBuilder statements + select = null; + from = null; + where = null; + orderBy = null; + groupBy = null; + } + + @Override + public String toString() { + StringBuilder result = new StringBuilder(fullQuery()). + append("; (PARAMS : "). + append(getParams()). + append("); (LIMIT : "). + append(startIndex). + append(", "). + append(endIndex). + append(')'); + return result.toString(); + } + }

1 0

r1915 - trunk
by tchemit＠users.nuiton.org April 29, 2010

April 29, 2010

Author: tchemit Date: 2010-04-29 07:57:59 +0200 (Thu, 29 Apr 2010) New Revision: 1915 Log: use i18n 1.2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-29 05:45:13 UTC (rev 1914) +++ trunk/pom.xml 2010-04-29 05:57:59 UTC (rev 1915) @@ -227,7 +227,7 @@ <eugene.version>2.0.2-SNAPSHOT</eugene.version> <lutinutil.version>1.2.2</lutinutil.version> <processor.version>1.0.3</processor.version> - <i18n.version>1.2.1</i18n.version> + <i18n.version>1.2.2</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version>

1 0

r1914 - trunk
by tchemit＠users.nuiton.org April 29, 2010

April 29, 2010

Author: tchemit Date: 2010-04-29 07:45:13 +0200 (Thu, 29 Apr 2010) New Revision: 1914 Log: Utilisation de mavenpom4redmine 2.1.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-28 08:43:14 UTC (rev 1913) +++ trunk/pom.xml 2010-04-29 05:45:13 UTC (rev 1914) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.2</version> + <version>2.1.3</version> </parent> <artifactId>topia</artifactId>

1 0

r1913 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org April 28, 2010

April 28, 2010

Author: fdesbois Date: 2010-04-28 10:43:14 +0200 (Wed, 28 Apr 2010) New Revision: 1913 Log: Depreciate InterfaceTransformer (use JavaInterfaceTransformer in EUGene instead) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java 2010-04-27 16:32:17 UTC (rev 1912) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceTransformer.java 2010-04-28 08:43:14 UTC (rev 1913) @@ -47,7 +47,9 @@ * Mise a jour: $Date$ * par : $Author$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.InterfaceTransformer" + * @deprecated since 2.4 use {@link org.nuiton.eugene.java.JavaInterfaceTransformer} instead */ +@Deprecated public class InterfaceTransformer extends ObjectModelTransformerToJava { private static final Log log = LogFactory.getLog(InterfaceTransformer.class);

1 0

r1912 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org April 27, 2010

April 27, 2010

Author: fdesbois Date: 2010-04-27 18:32:17 +0200 (Tue, 27 Apr 2010) New Revision: 1912 Log: missing space Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 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-04-27 16:26:36 UTC (rev 1911) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-04-27 16:32:17 UTC (rev 1912) @@ -808,7 +808,7 @@ */ public TopiaQuery addInElements(String propertyA, String propertyB) { StringBuilder builder = new StringBuilder(propertyA). - append("IN elements ("). + append(" IN elements ("). append(propertyB). append(')'); parentheses = false;

1 0

r1911 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework site/rst
by fdesbois＠users.nuiton.org April 27, 2010

April 27, 2010

Author: fdesbois Date: 2010-04-27 18:26:36 +0200 (Tue, 27 Apr 2010) New Revision: 1911 Log: [TopiaQuery] - correct documentation for null case - add method addInElements + ignore problematic orderBy in executeCount Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/site/rst/TopiaQuery.rst 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-04-23 14:35:05 UTC (rev 1910) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-04-27 16:26:36 UTC (rev 1911) @@ -798,6 +798,26 @@ } /** + * Add link constraint between two properties. {@code propertyA} is in + * elements of {@code propertyB} which is a collection with same type than + * {@code propertyA}. (HQL : A IN elements (B)) + * + * @param propertyA contains in propertyB collection + * @param propertyB collection which contains propertyA + * @return the TopiaQuery + */ + public TopiaQuery addInElements(String propertyA, String propertyB) { + StringBuilder builder = new StringBuilder(propertyA). + append("IN elements ("). + append(propertyB). + append(')'); + parentheses = false; + add(builder.toString()); + parentheses = true; + return this; + } + + /** * 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 @@ -1257,14 +1277,18 @@ /** * Execute a simple count on the query, i.e. the number of results get from - * the query. + * the query. The order is not considered to count the elements. * * @param transaction the TopiaContext to use for execution * @return an int corresponding to the number of result in the query * @throws TopiaException */ public int executeCount(TopiaContext transaction) throws TopiaException { - return executeToInteger(transaction, "COUNT(*)"); + StringBuilder oldOrder = orderBy; + orderBy = null; + int result = executeToInteger(transaction, "COUNT(*)"); + orderBy = oldOrder; + return result; } /** Modified: trunk/topia-persistence/src/site/rst/TopiaQuery.rst =================================================================== --- trunk/topia-persistence/src/site/rst/TopiaQuery.rst 2010-04-23 14:35:05 UTC (rev 1910) +++ trunk/topia-persistence/src/site/rst/TopiaQuery.rst 2010-04-27 16:26:36 UTC (rev 1911) @@ -104,10 +104,10 @@ query.addNotNull("name"); // Recherche des navires n'ayant pas de nom - query.add("name", null); + query.add("name", Op.EQ, null); // Recherche des navires ayant une date de construction 2003, 2004 ou 2006 - query.add("buildYear", Arrays.asList(new Object[] {2003, 2004, 2006})); + query.add("buildYear", 2003, 2004, 2006); Il est fortement conseillé d'utiliser les constantes des entités pour les noms de leurs propriétés ::

1 0

r1910 - in trunk/topia-persistence: . src/main/java/org/nuiton/topia/generator src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org April 23, 2010

April 23, 2010

Author: tchemit Date: 2010-04-23 16:35:05 +0200 (Fri, 23 Apr 2010) New Revision: 1910 Log: - Evolution #552: Clean api - Deprecates some TopiaGeneratorUil methods (already present in GeneratorUtil) Modified: trunk/topia-persistence/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/pom.xml 2010-04-23 14:35:05 UTC (rev 1910) @@ -274,7 +274,7 @@  <profile> - <id>reporting-profile</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-04-23 14:35:05 UTC (rev 1910) @@ -38,11 +38,11 @@ import java.util.*; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; @@ -56,7 +56,7 @@ /** * Classe regroupant divers méthodes utiles pour la génération des entités */ -public class TopiaGeneratorUtil extends GeneratorUtil { +public class TopiaGeneratorUtil extends JavaGeneratorUtil { /** * Logger @@ -77,7 +77,10 @@ public static final String STEREOTYPE_DTO = "dto"; /** * Stéréotype pour les objets devant être générées sous forme de bean + * @deprecated since 2.4, prefer use the + * {@link JavaGeneratorUtil#STEREOTYPE_BEAN} method. */ + @Deprecated public static final String STEREOTYPE_BEAN = "bean"; /** * Stéréotype pour les interfaces devant être générées sous forme de @@ -594,15 +597,19 @@ * * @param attr l'attribut a traiter * @return le nom de l'attribut de classe d'association + * @deprecated since 2.4, prefer use the + * {@link GeneratorUtil#getAssocAttrName(ObjectModelAttribute)} */ + @Deprecated public static String getAssocAttrName(ObjectModelAttribute attr) { - String typeName = attr.getType().substring( - attr.getType().lastIndexOf(".") + 1); - String result = attr.getName(); - if (attr.getName().equalsIgnoreCase(typeName)) { - result += StringUtils.capitalize( - attr.getAssociationClass().getName()); - } + String result = GeneratorUtil.getAssocAttrName(attr); +// String typeName = attr.getType().substring( +// attr.getType().lastIndexOf(".") + 1); +// String result = attr.getName(); +// if (attr.getName().equalsIgnoreCase(typeName)) { +// result += StringUtils.capitalize( +// attr.getAssociationClass().getName()); +// } return result; } @@ -953,13 +960,21 @@ return result; } + /** + * + * @param fqn fqn to parse + * @return the simple name of fqn + * @deprecated since 2.0.2 : already in GeneratorUtil + */ + @Deprecated public static String getSimpleName(String fqn) { - int lasIndex = fqn.lastIndexOf("."); - if (lasIndex == 1) { - // primitive type - return fqn; - } - return fqn.substring(lasIndex + 1); + return GeneratorUtil.getSimpleName(fqn); +// int lasIndex = fqn.lastIndexOf("."); +// if (lasIndex == 1) { +// // primitive type +// return fqn; +// } +// return fqn.substring(lasIndex + 1); /*if (lasIndex == aClass.getPackageName().length()) { // same package return fqn.substring(lasIndex + 1); 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 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-04-23 14:35:05 UTC (rev 1910) @@ -36,7 +36,6 @@ */ package org.nuiton.topia.persistence; -import java.lang.Class; import java.security.Permission; import java.util.Collection; import java.util.List; @@ -72,7 +71,7 @@ * * @return new entity instance * @since 2.3.1 - * @throws TopiaException + * @throws TopiaException if any pb while creating the entitie */ Entity newInstance() throws TopiaException; @@ -134,17 +133,17 @@ * * @param e l'entité instanciée à sauver * @return l'entité avec son topiaID valorisé - * @throws TopiaException + * @throws TopiaException if any pb while creating datas * * @since 2.3.1 - * @throw TopiaException if any pb while creating datas */ Entity create(Entity e) throws TopiaException; /** * Permet d'ajouter ou de mettre a jour un objet. Cela permet d'ajouter * par exemple un objet provenant d'un autre context mais du meme type - * de DAO + * de DAO. + * * @param e l'entite a ajouter ou mettre a jour * @return l'entity passé en paramètre. * @throws TopiaException if any pb while updating datas @@ -152,9 +151,10 @@ Entity update(Entity e) throws TopiaException; /** - * Permet de supprimer - * @param e - * @throws TopiaException + * Permet de supprimer une entite. + * + * @param e l'entite a supprimer + * @throws TopiaException if any pb while deleting datas */ void delete(Entity e) throws TopiaException; @@ -258,7 +258,7 @@ * * @param keys la liste des champs de la cle naturelle avec leur valeur * @return l'entite trouvé - * @throws TopiaException + * @throws TopiaException if any pb while getting datas */ Entity findByPrimaryKey(Map<String, Object> keys) throws TopiaException; @@ -278,8 +278,8 @@ /** * - * @param propertyName - * @param value + * @param propertyName le nom de la propriété + * @param value la valeur à tester * @param others les autres proprietes doivent aller par 2 propertyName, * value * @return l'entité trouvé @@ -295,8 +295,8 @@ /** * - * @param propertyName - * @param value + * @param propertyName le nom de la propriété + * @param value la valeur à tester * @param others les autres proprietes doivent aller par 2 propertyName, * value * @return l'entité trouvé @@ -315,35 +315,35 @@ * Cherche et renvoie la première entité trouvée dont les propriétés en clé * de Map contiennent toutes les valeurs de la Collection. * - * @param properties + * @param properties les proprietes a utiliser * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ - Entity findContainsProperties(Map<String, Collection> properties) throws + Entity findContainsProperties(Map<String, Collection<?>> properties) throws TopiaException; /** * Cherche et renvoie la première entité trouvée dont la propriété * propertyName contient values, ainsi de suite avec others. * - * @param propertyName - * @param values - * @param others + * @param propertyName le nom de la propriété + * @param values les premières valeurs à tester + * @param others les secondes valeurs ) tester * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ - Entity findContainsProperties(String propertyName, Collection values, + Entity findContainsProperties(String propertyName, Collection<?> values, Object... others) throws TopiaException; /** * Cherche et renvoie la première entité trouvée dont les propriétés en clé * de Map contiennent toutes les valeurs de la Collection. * - * @param properties + * @param properties les propriétés à tester * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ - List<Entity> findAllContainsProperties(Map<String, Collection> properties) + List<Entity> findAllContainsProperties(Map<String, Collection<?>> properties) throws TopiaException; /** @@ -351,13 +351,13 @@ * propertyName contient values, ainsi de suite avec others. * * @param propertyName the name of the property - * @param values - * @param others + * @param values les premières valeurs à tester + * @param others les secondes valeurs à tester * @return l'entité trouvé * @throws TopiaException if any pb while getting datas */ List<Entity> findAllContainsProperties(String propertyName, - Collection values, Object... others) throws TopiaException; + Collection<?> values, Object... others) throws TopiaException; /** * Find usages of the given {@code entity} in the entities of the given @@ -393,7 +393,7 @@ * service Taas. * * @param topiaId topiaId d'une entite - * @param actions + * @param actions encoded actions * @return la liste des permissions * @throws TopiaException if any pb while getting datas */ 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 2010-04-23 14:32:23 UTC (rev 1909) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-04-23 14:35:05 UTC (rev 1910) @@ -273,7 +273,7 @@ public E create(Object... properties) throws TopiaException { Map<String, Object> map = new HashMap<String, Object>(); Object propertyName = null; - Object value = null; + Object value; try { for (int i = 0; i < properties.length;) { propertyName = properties[i++]; @@ -413,7 +413,7 @@ } @Override - public E findContainsProperties(Map<String, Collection> properties) + public E findContainsProperties(Map<String, Collection<?>> properties) throws TopiaException { List<E> results = findAllContainsProperties(properties); E result = null; @@ -425,14 +425,14 @@ @Override public E findContainsProperties(String propertyName, - Collection values, Object... others) throws TopiaException { - Map<String, Collection> properties = new HashMap<String, Collection>(); + Collection<?> values, Object... others) throws TopiaException { + Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); properties.put(propertyName, values); Object name = null; for (int i = 0; i < others.length;) { try { name = others[i++]; - values = (Collection) others[i++]; + values = (Collection<?>) others[i++]; properties.put((String) name, values); } catch (ClassCastException eee) { throw new IllegalArgumentException( @@ -467,16 +467,16 @@ */ @Override public List<E> findAllContainsProperties(Map<String, - Collection> properties) throws TopiaException { + Collection<?>> properties) throws TopiaException { List<E> all = findAll(); List<E> result = new ArrayList<E>(); for (E e : all) { boolean ok = true; try { - for (Entry<String, Collection> kv : properties.entrySet()) { - Collection entityValues = (Collection) PropertyUtils + for (Entry<String, Collection<?>> kv : properties.entrySet()) { + Collection<?> entityValues = (Collection<?>) PropertyUtils .getProperty(e, kv.getKey()); - Collection values = kv.getValue(); + Collection<?> values = kv.getValue(); if (!entityValues.containsAll(values)) { ok = false; break; @@ -521,14 +521,14 @@ @Override public List<E> findAllContainsProperties(String propertyName, - Collection values, Object... others) throws TopiaException { - Map<String, Collection> properties = new HashMap<String, Collection>(); + Collection<?> values, Object... others) throws TopiaException { + Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); properties.put(propertyName, values); Object name = null; for (int i = 0; i < others.length;) { try { name = others[i++]; - values = (Collection) others[i++]; + values = (Collection<?>) others[i++]; properties.put((String) name, values); } catch (ClassCastException eee) { throw new IllegalArgumentException(

1 0

r1909 - in trunk: . topia-service-replication
by tchemit＠users.nuiton.org April 23, 2010

April 23, 2010

Author: tchemit Date: 2010-04-23 16:32:23 +0200 (Fri, 23 Apr 2010) New Revision: 1909 Log: - comment no more used dependencies from no used modules - rename reporting-profile into reporting Modified: trunk/pom.xml trunk/topia-service-replication/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-23 14:28:34 UTC (rev 1908) +++ trunk/pom.xml 2010-04-23 14:32:23 UTC (rev 1909) @@ -71,21 +71,9 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> + - </dependency> <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>${xmlrpc.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> @@ -113,40 +101,7 @@ <scope>runtime</scope> </dependency> -  <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>asm</artifactId> - <version>1.5.4-snapshot</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - <version>1.2.6</version> - <scope>compile</scope> - <exclusions> -  - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.8.0.GA</version> @@ -176,8 +131,61 @@ <scope>test</scope> </dependency> +  + +  + +  +  + +  +  +  + +  - <dependency> +  </dependencies> </dependencyManagement> @@ -216,7 +224,7 @@ <projectId>topia</projectId>  - <eugene.version>2.0.1</eugene.version> + <eugene.version>2.0.2-SNAPSHOT</eugene.version> <lutinutil.version>1.2.2</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.1</i18n.version> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-04-23 14:28:34 UTC (rev 1908) +++ trunk/topia-service-replication/pom.xml 2010-04-23 14:32:23 UTC (rev 1909) @@ -190,7 +190,7 @@  <profile> - <id>reporting-profile</id> + <id>reporting</id> <activation> <property> <name>performRelease</name>

1 0

r1908 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org April 23, 2010

April 23, 2010

Author: tchemit Date: 2010-04-23 16:28:34 +0200 (Fri, 23 Apr 2010) New Revision: 1908 Log: add FIXME on ServiceTransformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-23 12:28:49 UTC (rev 1907) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-23 14:28:34 UTC (rev 1908) @@ -451,7 +451,8 @@ */ protected void createOperationImplementation( ObjectModelClass serviceAbstract, - ObjectModelOperation abstOp, ObjectModelOperation source, + ObjectModelOperation abstOp, + ObjectModelOperation source, String serviceContractName) { // boolean to specify if the method need a transaction or not @@ -656,6 +657,7 @@ */ protected String getReturnValue(String returnType) { try { + //FIXME-TC20100423 : can not deal with Object types (float != Float) Primitive prim = Primitive.valueOf(StringUtils.upperCase(returnType)); return prim.getValue(); @@ -665,6 +667,7 @@ } } + //FIXME-TC20100423 : REMOVE THIS! protected enum Primitive { BYTE("0"), SHORT("0"),

1 0