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

r1981 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/xmi
by fdesbois＠users.nuiton.org 28 May '10

28 May '10

Author: fdesbois Date: 2010-05-28 10:35:24 +0200 (Fri, 28 May 2010) New Revision: 1981 Url: http://nuiton.org/repositories/revision/topia/1981 Log: Add memory debug in ServiceTransformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java trunk/topia-persistence/src/test/xmi/topiatest.zargo 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-05-27 16:44:07 UTC (rev 1980) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-05-28 08:35:24 UTC (rev 1981) @@ -300,17 +300,6 @@ ObjectModelModifier.PROTECTED); addException(beginTransaction, TopiaException.class); -// ObjectModelOperation treateError1 = -// addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", -// ObjectModelModifier.ABSTRACT, -// ObjectModelModifier.PROTECTED); -// addParameter(treateError1, Exception.class, "eee"); -// addParameter(treateError1, String.class, "message"); -// addParameter(treateError1, "Object...", "args"); -// if (exceptionName != null) { -// addException(treateError1, exceptionName); -// } - ObjectModelOperation treateError1 = addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", ObjectModelModifier.ABSTRACT, @@ -492,11 +481,6 @@ String abstName = abstOp.getName(); String abstParams = GeneratorUtil.getOperationParametersListName(abstOp); -// String separator = ""; -// for (ObjectModelParameter param : abstOp.getParameters()) { -// abstParams += separator + param.getName(); -// separator = ", "; -// } // Abstract operation return managment String abstReturnType = ""; @@ -565,9 +549,11 @@ <%=abstReturnType%><%=abstName%>(<%=abstParams%>); if (log.isDebugEnabled()) { long stopTime = System.currentTimeMillis(); + Runtime runtime = Runtime.getRuntime(); + long mem = (runtime.totalMemory() - runtime.freeMemory()) / 1048576; log.debug("<%=first%>:[ end <%=implName%> ] Time = " + DurationFormatUtils.formatDurationHMS( - stopTime - startTime)); + stopTime - startTime) + " _ Memory = " + mem + " Mo"); } <%=abstReturn%> }*/); Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1980 - in trunk/topia-persistence: . src/main/java/org/nuiton/topia/generator src/test/xmi
by fdesbois＠users.nuiton.org 27 May '10

27 May '10

Author: fdesbois Date: 2010-05-27 18:44:07 +0200 (Thu, 27 May 2010) New Revision: 1980 Url: http://nuiton.org/repositories/revision/topia/1980 Log: - Add EntityTransformer for tests (exclude old transformers) - Evo #643 : manage getter in EntityTransformer (with 'is' prefix for boolean attributes) Modified: trunk/topia-persistence/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-05-26 14:17:56 UTC (rev 1979) +++ trunk/topia-persistence/pom.xml 2010-05-27 16:44:07 UTC (rev 1980) @@ -187,11 +187,18 @@ <phase>generate-test-sources</phase> <configuration> <testPhase>true</testPhase> - <templates>org.nuiton.topia.generator.TopiaMetaTransformer, + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.EntityTransformer, org.nuiton.topia.generator.InterfaceTransformer, org.nuiton.topia.generator.BeanTransformer, org.nuiton.topia.generator.EntityDTOTransformer </templates> + <excludeTemplates> + <excludeTemplate>org.nuiton.topia.generator.EntityAbstractTransformer</excludeTemplate> + <excludeTemplate>org.nuiton.topia.generator.EntityImplTransformer</excludeTemplate> + <excludeTemplate>org.nuiton.topia.generator.EntityInterfaceTransformer</excludeTemplate> + </excludeTemplates> <fullPackagePath>org.nuiton.topia</fullPackagePath> <defaultPackage>org.nuiton.topia</defaultPackage> </configuration> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-05-26 14:17:56 UTC (rev 1979) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-05-27 16:44:07 UTC (rev 1980) @@ -81,16 +81,28 @@ * <li>There is no abstract method</li> * <li>There is no already defined such class in class-path</li> * </ul> - * + * * @author tchemit <chemit(a)codelutin.com> * @since 2.4 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityTransformer" */ public class EntityTransformer extends ObjectModelTransformerToJava { - + /** Logger */ private static final Log log = LogFactory.getLog(EntityTransformer.class); + protected ObjectModelInterface outputInterface; + + protected ObjectModelClass outputAbstract; + + protected ObjectModelClass outputImpl; + + protected void clean() { + outputInterface = null; + outputAbstract = null; + outputImpl = null; + } + @Override public void transformFromClass(ObjectModelClass input) { @@ -99,12 +111,12 @@ // not an entity, skip class. return; } - + if (log.isDebugEnabled()) { log.debug("for entity : "+input.getQualifiedName()); log.info("Will use classLoader "+ getClassLoader()); } - + // fix once for all the constant prefix to use String prefix = getConstantPrefix(input, ""); @@ -126,23 +138,30 @@ Collection<ObjectModelOperation> operations = input.getOperations(); - ObjectModelClassifier output; + // Create classifiers : Interface, Abstract + outputInterface = createInterface(clazzName, packageName); + outputAbstract = createAbstractClass(clazzName + "Abstract", packageName); - // generate interface + generateInterface(input, outputInterface, attributes, operations); + generateAbstract(input, outputAbstract, attributes, operations); - { - output = createInterface(clazzName, packageName); - generateInterface(input, (ObjectModelInterface) output, attributes, operations); - } - - // generate abstract +// ObjectModelClassifier output; +// +// // generate interface +// +// { +// outputInterface = createInterface(clazzName, packageName); +// generateInterface(input, outputInterface, attributes, operations); +// } +// +// // generate abstract +// +// { +// outputAbstract = createAbstractClass( clazzName + "Abstract", packageName); +// generateAbstract(input, outputAbstract, attributes, operations); +// +// } - { - output = createAbstractClass( clazzName + "Abstract", packageName); - generateAbstract(input, (ObjectModelClass) output, attributes, operations); - - } - boolean generateImpl = isGenerateImpl(input, operations); if (generateImpl) { @@ -153,14 +172,17 @@ } if (isAbstract(input)) { - output = createAbstractClass(implName, packageName); + outputImpl = createAbstractClass(implName, packageName); } else { - output = createClass(implName, packageName); + outputImpl = createClass(implName, packageName); } // generate impl - generateImpl(input, (ObjectModelClass) output); - } + generateImpl(input, outputImpl); + } + + // Clean data output after transformation + clean(); } protected boolean isGenerateImpl(ObjectModelClass input, @@ -178,7 +200,7 @@ } return false; } - + // On ne génère pas le impl si l'entité a des opérations qui ne sont // pas seulement pour le DAO if (!operations.isEmpty()) { @@ -215,7 +237,7 @@ if (log.isDebugEnabled()) { log.debug("Add constants from dependency : " + constants); } - + if (TopiaGeneratorUtil.hasDocumentation(input)) { setDocumentation(output,input.getDocumentation()); } @@ -262,7 +284,7 @@ } //Méthodes d'accès aux attributs d'une classe d'associations - + if (input instanceof ObjectModelAssociationClass) { ObjectModelAssociationClass assoc = (ObjectModelAssociationClass) input; @@ -593,13 +615,11 @@ // getXXX - op = addOperation(output, - "get" + StringUtils.capitalize(attrName), - attrType, - ObjectModelModifier.PACKAGE); - if (TopiaGeneratorUtil.hasDocumentation(attr)) { - setDocumentation(op, attr.getDocumentation()); - } + // Add getter for simple property. + // Only one call for this method, no need for abstract generation + // TODO-fdesbois-2010-05-27 : manage all attribute cases in this method + addSimpleGetterOperation(attr, null); + } else { String collectionInterface = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); @@ -738,7 +758,7 @@ attr2 = addParameter(op, assocClassFQN, GeneratorUtil.toLowerCaseFirstLetter(assocClassName)); setDocumentation(attr2, "La valeur de l'attribut " + assocClassName + " à positionner"); - // getXXX + // getXXX : getter interface for association attribute with unique multiplicity addOperation(output, "get" + StringUtils.capitalize(assocAttrName), @@ -868,7 +888,7 @@ addException(op2, exception); } } - + private void generateInterfaceAssociationAccessors(ObjectModelInterface output, String attrName, String attrType) { @@ -931,7 +951,7 @@ }*/ ); - // getXXX + // getXXX : getter for association attribute with unique multiplicity op = addOperation(result, "get" + StringUtils.capitalize(assocAttrName), @@ -960,20 +980,11 @@ ); - // getXXX + // getXXX : getter for simple attribute (as bean convention) - op = addOperation(result, - "get" + StringUtils.capitalize(attrName), - attrType, - ObjectModelModifier.PUBLIC); - setOperationBody(op, "" -/*{ - fireOnPreRead(<%=getConstantName(attrName)%>, <%=attrName%>); - <%=attrType%> result = this.<%=attrName%>; - fireOnPostRead(<%=getConstantName(attrName)%>, <%=attrName%>); - return result; -}*/ - ); + // Getter is already set in abstract when added in interface + // see {@link #addSimpleGetterOperation(ObjectModelAttribute, String)} + } } else { //NMultiplicity String collectionInterface = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); @@ -1340,7 +1351,7 @@ if (!attr.hasAssociationClass()) { - // getXXX + // getXXX : getter for collection entity attribute (N multiplicity) op = addOperation(result, "get" + StringUtils.capitalize(attrName), @@ -1385,7 +1396,8 @@ String assocClassFQN = attr.getAssociationClass().getQualifiedName(); // String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); - // getXXX + // getXXX : getter for association attribute with no parameter + // (return a collection) op = addOperation(result, "get" + StringUtils.capitalize(assocAttrName), @@ -1397,7 +1409,8 @@ }*/ ); - // getXXX + // getXXX : getter for association attribute with one parameter + // (return a single element) op = addOperation(result, "get" + StringUtils.capitalize(assocAttrName), @@ -1451,6 +1464,63 @@ } } + /** + * Add getter for simple property (neither association nor multiple). + * Will add two different operations for boolean case ('is' method and + * 'get' method). This method add the operation in both {@code + * outputAbstract} and {@code outputInterface}. + * + * @param attribute ObjectModelAttribute for getter operation + * @param operationPrefix Operation prefix : 'get' by default, if prefix + * is null + */ + protected void addSimpleGetterOperation(ObjectModelAttribute attribute, + String operationPrefix) { + + String attrName = attribute.getName(); + String attrType = attribute.getType(); + + if (operationPrefix == null) { + operationPrefix = TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX; + } + + if (log.isDebugEnabled()) { + log.debug("Add getter operation for " + attrName + + " prefix = " + operationPrefix); + } + + // CONTRACT in Interface + ObjectModelOperation contract = addOperation(outputInterface, + operationPrefix + StringUtils.capitalize(attrName), + attrType, + ObjectModelModifier.PACKAGE); + + if (TopiaGeneratorUtil.hasDocumentation(attribute)) { + setDocumentation(contract, attribute.getDocumentation()); + } + + // IMPLEMENTATION in Abstract + ObjectModelOperation impl = addOperation(outputAbstract, + contract.getName(), + contract.getReturnType(), + ObjectModelModifier.PUBLIC); + setOperationBody(impl, "" +/*{ + fireOnPreRead(<%=getConstantName(attrName)%>, <%=attrName%>); + <%=attrType%> result = this.<%=attrName%>; + fireOnPostRead(<%=getConstantName(attrName)%>, <%=attrName%>); + return result; +}*/ + ); + + // Generate 'is' getter for boolean attributes + if (attrType.toLowerCase().contains("boolean") && + !operationPrefix.equals(TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX)) { + addSimpleGetterOperation(attribute, + TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX); + } + } + protected void generateToStringMethod(ObjectModelClass output, ObjectModelClass clazz) { if (log.isDebugEnabled()) { Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1979 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 16:17:56 +0200 (Wed, 26 May 2010) New Revision: 1979 Url: http://nuiton.org/repositories/revision/topia/1979 Log: Change some method names in TopiaQuery Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.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-05-26 11:49:20 UTC (rev 1978) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 14:17:56 UTC (rev 1979) @@ -227,8 +227,8 @@ * @version $Revision$ * @since 2.3.0 * <p/> - * Mise a jour: $Date$ - * par : $Author$ + * Mise a jour: $Date$ par + * : $Author$ */ public class TopiaQuery { @@ -471,6 +471,7 @@ result.append(selectStatement).append(select); // Set default select if there is more than one table in from // part and main alias is defined + // Note : maybe a problem with using new {@link #addFrom(String, String) with other than ',' separator } else if (StringUtils.contains(from.toString(), ',') && StringUtils.isNotEmpty(mainAlias)) { result.append(selectStatement).append(mainAlias); @@ -518,66 +519,6 @@ return this; } - /** - * Method used to add a subquery in an existing query. The params will be - * automatically checked and copied from the subquery to the current one. - * This method is used to inject {@code subquery} in WHERE part of the - * query. The {@code queryPart} is the element in the query to bind with the - * {@code subquery}. The ? character is used to inject the subquery into the - * {@code queryPart}. Ex : - * <pre> - * // Add a SUB_ELMT = (subquery) into the query - * query.addSubQuery("SUB_ELMT = (?)", subquery, false); - * </pre> - * - * @param queryPart part of the query where subquery need to be injected - * @param subquery existing topiaQuery as subquery - * @return the TopiaQuery - * @see TopiaQuery#getValueName(String) - * @since 2.4 - */ - public TopiaQuery addSubQuery(String queryPart, - TopiaQuery subquery) { - - List<Object> subqueryParams = subquery.getParams(); - String subqueryString = subquery.fullQuery(); - - // If no params is still defined, use those from subquery. - if (CollectionUtils.isEmpty(params)) { - addParams(subqueryParams); - } else { - for (int i = 0; i < subqueryParams.size(); i += 2) { - - String paramName = (String) subqueryParams.get(i); - Object paramValue = subqueryParams.get(i + 1); - - // Check existence of paramName - int index = params.indexOf(paramName); - - // If already defined - if (index != -1) { - Object existingValue = params.get(index + 1); - - // Only change paramName in not equals case - if (!ObjectUtils.equals(existingValue, paramValue)) { - String newParamName = getValueName(paramName); - // Replace old paramName in subquery - subqueryString = - subqueryString.replace(":" + paramName, - ":" + newParamName); - - // Add the param to the current query - addParam(newParamName, paramValue); - } - } - } - } - - // Replace ? injection by the subquery - String result = queryPart.replace("?", subqueryString); - return add(result); - } - public List<Object> getParams() { if (params == null) { params = new ArrayList<Object>(); @@ -624,13 +565,24 @@ } /** + * @param where + * @return TopiaQuery + * @deprecated since 2.4, use {@link #addWhere(String)} instead + */ + @Deprecated + public TopiaQuery add(String where) { + return addWhere(where); + } + + /** * Add a where element to the Query. Could be anything. Parentheses are * added automatically (even if there are not needed). * * @param where element to add * @return the TopiaQuery + * @since 2.4 */ - public TopiaQuery add(String where) { + public TopiaQuery addWhere(String where) { if (StringUtils.isEmpty(where)) { return this; } @@ -652,20 +604,35 @@ } /** + * @param paramName + * @param constraint + * @param paramValue + * @return TopiaQuery + * @deprecated since 2.4, use {@link #addWhere(String, Op, Object)} instead + */ + @Deprecated + public TopiaQuery add(String paramName, Op constraint, Object paramValue) { + return addWhere(paramName, constraint, paramValue); + } + + /** * 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. If the paramValue is - * Null, the paramName will be added to the query with the constraint null - * (IS NULL). + * The {@code operator} is needed to determine what type of operation it is. + * Ex : add("boat", Op.EQ, boat) means -> boat = :boat. Also if the paramValue + * is Null, the paramName will be added to the query with the constraint + * null (IS NULL). + * <p/> + * TODO-fdesbois-2010-05-26 : maybe manage more than one paramValue with Object... Depends on operator * * @param paramName the name of the parameter in the query (attribute of * the entity) - * @param constraint the operation concerned + * @param operator the operation concerned * @param paramValue the value of the parameter (an other entity, a String, * ...) * @return the TopiaQuery + * @since 2.4 */ - public TopiaQuery add(String paramName, Op constraint, Object paramValue) { + public TopiaQuery addWhere(String paramName, Op operator, Object paramValue) { StringBuilder result = new StringBuilder(paramName).append(' '); if (log.isDebugEnabled()) { log.debug("paramValue = " + paramValue); @@ -674,34 +641,12 @@ result.append(Op.NULL); } else { String valueName = getValueName(paramName); - result.append(constraint).append(" :").append(valueName); + result.append(operator).append(" :").append(valueName); addParam(valueName, paramValue); } parentheses = false; - return add(result.toString()); - } + return addWhere(result.toString()); - /** - * Add an element to the query. The nullity is tested or a constraint is - * added for that element. Ex : addNullOr("begin", Op.GT, new Date()) means - * begin IS NULL OR begin > :begin (where :begin = new Date()). - * - * @param paramName the name of the parameter in the query (attribute of - * the entity) - * @param constraint the operation concerned by the or - * @param paramValue the value of the parameter (an other entity, a String, - * ...) - * @return the TopiaQuery - */ - public TopiaQuery addNullOr(String paramName, Op constraint, - Object paramValue) { - String valueName = getValueName(paramName); - StringBuilder result = - new StringBuilder(paramName).append(' ').append(Op.NULL). - append(" OR ").append(paramName).append(constraint). - append(" :").append(valueName); - addParam(valueName, paramValue); - return add(result.toString()); } protected String getValueName(String paramName) { @@ -718,15 +663,14 @@ } /** - * Add an element to the query with the constraint Not null. - * - * @param paramName name of the parameter in the query - * @return the TopiaQuery + * @param paramName + * @param paramValue + * @return TopiaQuery + * @since 2.3.1 + * @deprecated since 2.4, use {@link #addEquals(String, Object...)} instead */ - public TopiaQuery addNotNull(String paramName) { - StringBuilder result = - new StringBuilder(paramName).append(' ').append(Op.NOT_NULL); - return add(result.toString()); + public TopiaQuery add(String paramName, Object... paramValue) { + return addEquals(paramName, paramValue); } /** @@ -736,16 +680,19 @@ * statement IN will be used. You can also have a null value in the {@code * paramValue} list (except if it's the only one value, it's ambiguous). * Note : this method do nothing if the {@code paramValue} is not defined. - * If you want to add the constraint null on the {@code paramName} use - * {@link #add(String, Op, Object)} as : add("param", Op.EQ, null); + * You can also set {@code paramValue} to null if you want the {@code + * paramName} to be null in the query. * * @param paramName name of the parameter in the query * @param paramValue values of the parameter * @return the TopiaQuery - * @see TopiaQuery#add(String, Op, Object) - * @since 2.3.1 + * @see TopiaQuery#addWhere(String, Op, Object) + * @since 2.4 */ - public TopiaQuery add(String paramName, Object... paramValue) { + public TopiaQuery addEquals(String paramName, Object... paramValue) { + if (paramValue == null) { + return addWhere(paramName, Op.EQ, null); + } int length = paramValue.length; // Do nothing if there is no value defined if (length == 0) { @@ -756,7 +703,7 @@ if (log.isDebugEnabled()) { log.debug("Only one value " + Arrays.toString(paramValue)); } - return add(paramName, Op.EQ, paramValue[0]); + return addWhere(paramName, Op.EQ, paramValue[0]); } // Multiple values is defined StringBuilder values = new StringBuilder(); @@ -779,7 +726,7 @@ } // Create buffer for IN statement with values StringBuilder buffer = new StringBuilder(); - buffer.append(paramName).append(" IN(").append(values).append(")"); + buffer.append(paramName).append(" IN (").append(values).append(")"); // Add the OR statement for null value if needed if (addNull) { buffer.append(" OR "). @@ -788,10 +735,20 @@ // no parentheses needed in this case (no OR statement) parentheses = false; } - return add(buffer.toString()); + return addWhere(buffer.toString()); } /** + * @param properties + * @return TopiaQuery + * @deprecated since 2.4 use {@link #addEquals(Map)} + */ + @Deprecated + public TopiaQuery add(Map<String, Object> properties) { + return addEquals(properties); + } + + /** * 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 @@ -799,15 +756,51 @@ * * @param properties to add to the query * @return the TopiaQuery + * @since 2.4 */ - public TopiaQuery add(Map<String, Object> properties) { + public TopiaQuery addEquals(Map<String, Object> properties) { for (String key : properties.keySet()) { - add(key, properties.get(key)); + addEquals(key, properties.get(key)); } return this; } /** + * Add an element to the query with the constraint Not null. + * + * @param paramName name of the parameter in the query + * @return the TopiaQuery + */ + public TopiaQuery addNotNull(String paramName) { + StringBuilder result = + new StringBuilder(paramName).append(' ').append(Op.NOT_NULL); + return addWhere(result.toString()); + } + + /** + * Add an element to the query. The nullity is tested or a constraint is + * added for that element. Ex : addNullOr("begin", Op.GT, new Date()) means + * begin IS NULL OR begin > :begin (where :begin = new Date()). + * + * @param paramName the name of the parameter in the query (attribute of + * the entity) + * @param constraint the operation concerned by the or + * @param paramValue the value of the parameter (an other entity, a String, + * ...) + * @return the TopiaQuery + */ + public TopiaQuery addNullOr(String paramName, Op constraint, + Object paramValue) { + String valueName = getValueName(paramName); + StringBuilder result = + new StringBuilder(paramName).append(' ').append(Op.NULL). + append(" OR ").append(paramName).append(constraint). + append(" :").append(valueName); + addParam(valueName, paramValue); + return addWhere(result.toString()); + } + + /** * 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)) @@ -819,16 +812,74 @@ */ public TopiaQuery addInElements(String propertyA, String propertyB) { StringBuilder builder = new StringBuilder(propertyA). - append(" IN elements ("). - append(propertyB). - append(')'); + append(" IN elements(").append(propertyB).append(')'); parentheses = false; - add(builder.toString()); + addWhere(builder.toString()); parentheses = true; return this; } /** + * Method used to add a subquery in an existing query. The params will be + * automatically checked and copied from the subquery to the current one. + * This method is used to inject {@code subquery} in WHERE part of the + * query. The {@code queryPart} is the element in the query to bind with the + * {@code subquery}. The ? character is used to inject the subquery into the + * {@code queryPart}. Ex : + * <pre> + * // Add a SUB_ELMT = (subquery) into the query + * query.addSubQuery("SUB_ELMT = (?)", subquery, false); + * </pre> + * + * @param queryPart part of the query where subquery need to be injected + * @param subquery existing topiaQuery as subquery + * @return the TopiaQuery + * @see TopiaQuery#getValueName(String) + * @since 2.4 + */ + public TopiaQuery addSubQuery(String queryPart, + TopiaQuery subquery) { + + List<Object> subqueryParams = subquery.getParams(); + String subqueryString = subquery.fullQuery(); + + // If no params is still defined, use those from subquery. + if (CollectionUtils.isEmpty(params)) { + addParams(subqueryParams); + } else { + for (int i = 0; i < subqueryParams.size(); i += 2) { + + String paramName = (String) subqueryParams.get(i); + Object paramValue = subqueryParams.get(i + 1); + + // Check existence of paramName + int index = params.indexOf(paramName); + + // If already defined + if (index != -1) { + Object existingValue = params.get(index + 1); + + // Only change paramName in not equals case + if (!ObjectUtils.equals(existingValue, paramValue)) { + String newParamName = getValueName(paramName); + // Replace old paramName in subquery + subqueryString = + subqueryString.replace(":" + paramName, + ":" + newParamName); + + // Add the param to the current query + addParam(newParamName, paramValue); + } + } + } + } + + // Replace ? injection by the subquery + String result = queryPart.replace("?", subqueryString); + return addWhere(result); + } + + /** * 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 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-05-26 11:49:20 UTC (rev 1978) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-26 14:17:56 UTC (rev 1979) @@ -469,7 +469,7 @@ @Override public E findByTopiaId(String id) throws TopiaException { - TopiaQuery query = createQuery().add(TopiaEntity.TOPIA_ID, id); + TopiaQuery query = createQuery().addEquals(TopiaEntity.TOPIA_ID, id); E result = findByQuery(query); return result; } @@ -495,7 +495,7 @@ @Override public E findByProperties(Map<String, Object> properties) throws TopiaException { - TopiaQuery query = createQuery().add(properties); + TopiaQuery query = createQuery().addEquals(properties); E result = findByQuery(query); return result; } @@ -540,7 +540,7 @@ @Override public List<E> findAllByProperties(Map<String, Object> properties) throws TopiaException { - TopiaQuery query = createQuery().add(properties); + TopiaQuery query = createQuery().addEquals(properties); List<E> results = findAllByQuery(query); return results; } @@ -588,7 +588,7 @@ Object... others) throws TopiaException { Map<String, Object> properties = convertPropertiesArrayToMap(propertyName, propertyValue, others); - TopiaQuery query = createQuery().add(properties); + TopiaQuery query = createQuery().addEquals(properties); boolean result = existByQuery(query); return result; } @@ -789,28 +789,6 @@ "l'obbjet " + e, eee); } } -// } catch (IllegalAccessException eee) { -// ok = false; -// if (log.isWarnEnabled()) { -// log.warn( -// "Impossible d'acceder a la methode demandé pour l'obbjet " -// + e, eee); -// } -// } catch (InvocationTargetException eee) { -// ok = false; -// if (log.isWarnEnabled()) { -// log.warn( -// "Impossible d'acceder a la methode demandé pour l'obbjet " -// + e, eee); -// } -// } catch (NoSuchMethodException eee) { -// ok = false; -// if (log.isWarnEnabled()) { -// log.warn( -// "Impossible d'acceder a la methode demandé pour l'obbjet " -// + e, eee); -// } -// } if (ok) { result.add(e); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-26 11:49:20 UTC (rev 1978) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-26 14:17:56 UTC (rev 1979) @@ -42,16 +42,16 @@ // Test with one paramValue String value = "topia"; TopiaQuery query = new TopiaQuery(QueriedEntity.class); - query.add(QueriedEntity.TEST_ADD, value); + query.addEquals(QueriedEntity.TEST_ADD, value); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + "WHERE testAdd = :testAdd", query.fullQuery()); // Test with null paramValue - String nullValue = null; + //String nullValue = null; query = new TopiaQuery(QueriedEntity.class); - query.add(QueriedEntity.TEST_ADD, nullValue); + query.addEquals(QueriedEntity.TEST_ADD, null); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + "WHERE testAdd IS NULL", @@ -60,18 +60,18 @@ // Test with two paramValues String value2 = "eugene"; query = new TopiaQuery(QueriedEntity.class); - query.add(QueriedEntity.TEST_ADD, value, value2); + query.addEquals(QueriedEntity.TEST_ADD, value, value2); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE testAdd IN(:testAdd1, :testAdd2)", + "WHERE testAdd IN (:testAdd1, :testAdd2)", query.fullQuery()); // Test with two paramValues + null query = new TopiaQuery(QueriedEntity.class); - query.add(QueriedEntity.TEST_ADD, value, value2, null); + query.addEquals(QueriedEntity.TEST_ADD, value, value2, null); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE (testAdd IN(:testAdd1, :testAdd2) OR testAdd IS NULL)", + "WHERE (testAdd IN (:testAdd1, :testAdd2) OR testAdd IS NULL)", query.fullQuery()); } @@ -80,12 +80,12 @@ // Test 1 : Subquery with two params with different values TopiaQuery query = new TopiaQuery(QueriedEntity.class). - add(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.TEST_ADD, "value1"); // Exist 2 params Assert.assertEquals(2, query.getParams().size()); TopiaQuery subquery = new TopiaQuery(QueriedEntity.class). - add(QueriedEntity.TEST_ADD, "value2"); + addEquals(QueriedEntity.TEST_ADD, "value2"); query.addSubQuery("Q1 = (?)", subquery); log.debug(query); @@ -96,12 +96,12 @@ // Test 2 : Subquery with two params with different values // one of them is null query = new TopiaQuery(QueriedEntity.class). - add(QueriedEntity.TEST_ADD, TopiaQuery.Op.EQ, null); + addWhere(QueriedEntity.TEST_ADD, TopiaQuery.Op.EQ, null); // Exist 0 param (null value) Assert.assertEquals(0, query.getParams().size()); subquery = new TopiaQuery(QueriedEntity.class). - add(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.TEST_ADD, "value1"); query.addSubQuery("Q1 = (?)", subquery); log.debug(query); @@ -111,12 +111,12 @@ // Test 3 : Subquery with two params with same value query = new TopiaQuery(QueriedEntity.class, "Q1"). - add(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.TEST_ADD, "value1"); // Exist 2 params Assert.assertEquals(2, query.getParams().size()); subquery = new TopiaQuery(QueriedEntity.class, "Q2"). - add(QueriedEntity.TEST_ADD, "value1"); + addEquals(QueriedEntity.TEST_ADD, "value1"); query.addSubQuery("Q1 = (?)", subquery); log.debug(query);

1 0

r1978 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 13:49:20 +0200 (Wed, 26 May 2010) New Revision: 1978 Url: http://nuiton.org/repositories/revision/topia/1978 Log: change constant name for from separator 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-05-26 11:39:47 UTC (rev 1977) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 11:49:20 UTC (rev 1978) @@ -234,8 +234,10 @@ private static final Log log = LogFactory.getLog(TopiaQuery.class); - public static final String DEFAULT_FROM_SEPARATOR = ", "; + public static final String FROM_SEPARATOR_DEFAULT = ", "; + public static final String FROM_SEPARATOR_JOIN = " JOIN "; + /** Params for HQL query * */ protected List<Object> params; @@ -420,13 +422,13 @@ * * @param str the element to add * @param separator The separator to use before adding the element (if null - * the {@link #DEFAULT_FROM_SEPARATOR} will be used). + * the {@link #FROM_SEPARATOR_DEFAULT} will be used). * @return the TopiaQuery * @since 2.4 */ public TopiaQuery addFrom(String str, String separator) { if (separator == null) { - separator = DEFAULT_FROM_SEPARATOR; + separator = FROM_SEPARATOR_DEFAULT; } from.append(separator).append(str); return this;

1 0

r1977 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 13:39:47 +0200 (Wed, 26 May 2010) New Revision: 1977 Url: http://nuiton.org/repositories/revision/topia/1977 Log: setFrom with String not necessary, use addFrom with separator argument for join support 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-05-26 10:08:58 UTC (rev 1976) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 11:39:47 UTC (rev 1977) @@ -234,6 +234,8 @@ private static final Log log = LogFactory.getLog(TopiaQuery.class); + public static final String DEFAULT_FROM_SEPARATOR = ", "; + /** Params for HQL query * */ protected List<Object> params; @@ -400,13 +402,33 @@ /** * Add an element to the from in the query. Used to add some other data in - * the query or for join. + * the query. The default separator used is the ", ". * * @param str the element to add * @return the TopiaQuery + * @see #addFrom(String, String) + * @deprecated since 2.4 use {@link #addFrom(String, String)} */ + @Deprecated public TopiaQuery addFrom(String str) { - from.append(", ").append(str); + return addFrom(str, null); + } + + /** + * Add an element to the from in the query. Used to add some other data in + * the query or for join as specific {@code separator}. + * + * @param str the element to add + * @param separator The separator to use before adding the element (if null + * the {@link #DEFAULT_FROM_SEPARATOR} will be used). + * @return the TopiaQuery + * @since 2.4 + */ + public TopiaQuery addFrom(String str, String separator) { + if (separator == null) { + separator = DEFAULT_FROM_SEPARATOR; + } + from.append(separator).append(str); return this; } @@ -417,7 +439,7 @@ * @return the TopiaQuery */ public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass) { - return addFrom(entityClass.getName()); + return addFrom(entityClass.getName(), null); } /** @@ -429,7 +451,7 @@ */ public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass, String alias) { - return addFrom(entityClass.getName() + " " + alias); + return addFrom(entityClass.getName() + " " + alias, null); } /** @@ -497,10 +519,10 @@ /** * Method used to add a subquery in an existing query. The params will be * automatically checked and copied from the subquery to the current one. - * This method is used to inject {@code subquery} in WHERE part of the query. - * The {@code queryPart} is the element in the query to bind with the {@code - * subquery}. The ? character is used to inject the subquery - * into the {@code queryPart}. Ex : + * This method is used to inject {@code subquery} in WHERE part of the + * query. The {@code queryPart} is the element in the query to bind with the + * {@code subquery}. The ? character is used to inject the subquery into the + * {@code queryPart}. Ex : * <pre> * // Add a SUB_ELMT = (subquery) into the query * query.addSubQuery("SUB_ELMT = (?)", subquery, false);

1 0

r1976 - trunk/topia-persistence/src/test/xmi
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 12:08:58 +0200 (Wed, 26 May 2010) New Revision: 1976 Url: http://nuiton.org/repositories/revision/topia/1976 Log: Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1975 - in trunk/topia-persistence/src: main/java/org/nuiton/topia main/java/org/nuiton/topia/framework main/java/org/nuiton/topia/persistence test/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 11:59:37 +0200 (Wed, 26 May 2010) New Revision: 1975 Url: http://nuiton.org/repositories/revision/topia/1975 Log: - Evo #637 : deprecate all execute methods with no topiaContext in argument + constructor with DAO. Add method findByQuery in TopiaContext. - For subQuery, no need of flag in argument for SELECT or WHERE statement, only WHERE statement support subqueries. Modified: 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/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContext.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -31,6 +31,7 @@ import org.nuiton.topia.event.TopiaEntityVetoable; import org.nuiton.topia.event.TopiaTransactionListener; import org.nuiton.topia.event.TopiaTransactionVetoable; +import org.nuiton.topia.framework.TopiaQuery; import org.nuiton.topia.framework.TopiaService; import org.nuiton.topia.persistence.TopiaEntity; @@ -174,6 +175,17 @@ TopiaEntity findByTopiaId(String topiaId) throws TopiaException; /** + * Retrieve results executing a simple {@code query}. Generally this method + * is used for complex query where output type is specific (more than one + * element in the SELECT). + * + * @param query TopiaQuery to execute + * @return a List of results as hibernate give us + * @throws TopiaException + */ + List findByQuery(TopiaQuery query) throws TopiaException; + + /** * Permet de faire une requete HQL hibernate directement sur la base. * * @param hql la requete a faire 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 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -920,6 +920,11 @@ return result; } + @Override + public List findByQuery(TopiaQuery query) throws TopiaException { + return query.execute(this); + } + /* * (non-Javadoc) * @see TopiaContext#find(java.lang.String, java.lang.Object[]) 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-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -265,6 +265,11 @@ protected String mainAlias; + /** + * @deprecated since 2.4 : need calling right execute method directly from + * DAO + */ + @Deprecated protected TopiaDAO<? extends TopiaEntity> dao; /** Enum to simmplify using operation in query */ @@ -340,7 +345,10 @@ * added to the select part of the query if it is needed. * * @param dao DAO linked to the entity to threat + * @deprecated since 2.4 : instantiate the query from DAO {@link + * TopiaDAO#createQuery()} */ + @Deprecated public TopiaQuery(TopiaDAO<? extends TopiaEntity> dao) { this(); setFrom(dao.getEntityClass()); @@ -353,7 +361,10 @@ * * @param dao DAO linked to the entity to threat * @param alias of the main entity in the query + * @deprecated since 2.4 : instantiate the query from DAO {@link + * TopiaDAO#createQuery(String)} */ + @Deprecated public TopiaQuery(TopiaDAO<? extends TopiaEntity> dao, String alias) { this(); setFrom(dao.getEntityClass(), alias); @@ -402,7 +413,7 @@ /** * Add an other entity type to the from in the query. * - * @param entityClass different from the mainEntity in the DAO + * @param entityClass different from the mainEntity * @return the TopiaQuery */ public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass) { @@ -412,7 +423,7 @@ /** * Add an other entity type to the from in the query with an alias. * - * @param entityClass different from the mainEntity in the DAO + * @param entityClass different from the mainEntity * @param alias of the entity in the query * @return the TopiaQuery */ @@ -486,31 +497,23 @@ /** * Method used to add a subquery in an existing query. The params will be * automatically checked and copied from the subquery to the current one. - * This method is used to inject {@code subquery} in SELECT or WHERE parts - * of the query. The flag {@code select} is used to tell the method that the - * element will be added to the select (if false, the element will be added - * to the where). The {@code queryPart} is the element in the query to bind - * with the {@code subquery}. The ? character is used to inject the subquery + * This method is used to inject {@code subquery} in WHERE part of the query. + * The {@code queryPart} is the element in the query to bind with the {@code + * subquery}. The ? character is used to inject the subquery * into the {@code queryPart}. Ex : * <pre> - * // Add a SUM(subquery) into the SELECT of the query - * query.addSubQuery("SUM(?)", subquery, true); - * // Add a SUB_ELMT = (subquery) into the WHERE of the query + * // Add a SUB_ELMT = (subquery) into the query * query.addSubQuery("SUB_ELMT = (?)", subquery, false); * </pre> * * @param queryPart part of the query where subquery need to be injected * @param subquery existing topiaQuery as subquery - * @param select If true, the queryPart will be added to the SELECT - * statement, if false the default query statement is the - * WHERE * @return the TopiaQuery * @see TopiaQuery#getValueName(String) * @since 2.4 */ public TopiaQuery addSubQuery(String queryPart, - TopiaQuery subquery, - boolean select) { + TopiaQuery subquery) { List<Object> subqueryParams = subquery.getParams(); String subqueryString = subquery.fullQuery(); @@ -548,9 +551,6 @@ // Replace ? injection by the subquery String result = queryPart.replace("?", subqueryString); - if (select) { - return addSelect(result); - } return add(result); } @@ -973,7 +973,9 @@ * @return a List of results * @throws TopiaException for error during execution * @see #execute(TopiaContext) + * @deprecated since 2.4, need transaction, use {@link #execute(TopiaContext)} */ + @Deprecated public List execute() throws TopiaException { validateDAO(); return execute(dao.getContext()); @@ -1134,7 +1136,10 @@ * @return an Object * @throws TopiaException for error on query execution * @see #executeToObject(TopiaContext, String) + * @deprecated since 2.4, need transaction, use {@link #executeToObject(TopiaContext, + * String)} */ + @Deprecated public Object executeToObject(String select) throws TopiaException { validateDAO(); return executeToObject(dao.getContext(), select); @@ -1163,7 +1168,10 @@ * @return an Integer * @throws TopiaException for error on query execution * @see #executeToInteger(TopiaContext, String) + * @deprecated since 2.4, need transaction, use {@link #executeToInteger(TopiaContext, + * String)} */ + @Deprecated public int executeToInteger(String select) throws TopiaException { validateDAO(); return executeToInteger(dao.getContext(), select); @@ -1191,7 +1199,10 @@ * @return a String result * @throws TopiaException for error on query execution * @see #executeToString(TopiaContext, String) + * @deprecated since 2.4, need transaction, use {@link #executeToString(TopiaContext, + * String)} */ + @Deprecated public String executeToString(String select) throws TopiaException { validateDAO(); return executeToString(dao.getContext(), select); @@ -1243,6 +1254,7 @@ return executeCount(dao.getContext()); } + @Deprecated protected boolean validateDAO() throws TopiaException { if (dao == null) { throw new TopiaException( 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-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -455,17 +455,23 @@ @Override public TopiaQuery createQuery() { + // Need to be change by constructor with entity only, only when + // method from TopiaQuery will be removed return new TopiaQuery(this); } @Override public TopiaQuery createQuery(String entityAlias) { + // Need to be change by constructor with entity only, only when + // method from TopiaQuery will be removed return new TopiaQuery(this, entityAlias); } @Override public E findByTopiaId(String id) throws TopiaException { - return findByQuery(createQuery().add(TopiaEntity.TOPIA_ID, id)); + TopiaQuery query = createQuery().add(TopiaEntity.TOPIA_ID, id); + E result = findByQuery(query); + return result; } @Override @@ -480,26 +486,6 @@ @Override public E findByProperties(String propertyName, Object value, Object... others) throws TopiaException { -// Map<String, Object> properties = new HashMap<String, Object>(); -// properties.put(propertyName, value); -// Object name = null; -// for (int i = 0; i < others.length;) { -// try { -// name = others[i++]; -// value = others[i++]; -// properties.put((String) name, value); -// } catch (ClassCastException eee) { -// throw new IllegalArgumentException( -// "Les noms des propriétés doivent être des chaines et " + -// "non pas " + propertyName.getClass().getName(), -// eee); -// } catch (ArrayIndexOutOfBoundsException eee) { -// throw new IllegalArgumentException( -// "Le nombre d'argument n'est pas un nombre pair: " -// + (others.length + 2) -// + " La dernière propriété était: " + name, eee); -// } -// } Map<String, Object> properties = convertPropertiesArrayToMap(propertyName, value, others); E result = findByProperties(properties); @@ -509,22 +495,28 @@ @Override public E findByProperties(Map<String, Object> properties) throws TopiaException { - return findByQuery(createQuery().add(properties)); + TopiaQuery query = createQuery().add(properties); + E result = findByQuery(query); + return result; } @Override public E findByQuery(TopiaQuery query) throws TopiaException { - return query.executeToEntity(context, getEntityClass()); + E result = query.executeToEntity(context, getEntityClass()); + return result; } @Override public List<E> findAll() throws TopiaException { - return findAllByQuery(createQuery()); + List<E> results = findAllByQuery(createQuery()); + return results; } @Override public List<String> findAllIds() throws TopiaException { - return createQuery().setSelect(TopiaEntity.TOPIA_ID).execute(); + TopiaQuery query = createQuery().setSelect(TopiaEntity.TOPIA_ID); + List<String> results = context.findByQuery(query); + return results; } @Override @@ -539,26 +531,6 @@ @Override public List<E> findAllByProperties(String propertyName, Object value, Object... others) throws TopiaException { -// Map<String, Object> properties = new HashMap<String, Object>(); -// properties.put(propertyName, value); -// Object name = null; -// for (int i = 0; i < others.length;) { -// try { -// name = others[i++]; -// value = others[i++]; -// properties.put((String) name, value); -// } catch (ClassCastException eee) { -// throw new IllegalArgumentException( -// "Les noms des propriétés doivent être des chaines et " + -// "non pas " + propertyName.getClass().getName(), -// eee); -// } catch (ArrayIndexOutOfBoundsException eee) { -// throw new IllegalArgumentException( -// "Le nombre d'argument n'est pas un nombre pair: " -// + (others.length + 2) -// + " La dernière propriété était: " + name, eee); -// } -// } Map<String, Object> properties = convertPropertiesArrayToMap(propertyName, value, others); List<E> result = findAllByProperties(properties); @@ -568,33 +540,41 @@ @Override public List<E> findAllByProperties(Map<String, Object> properties) throws TopiaException { - return findAllByQuery(createQuery().add(properties)); + TopiaQuery query = createQuery().add(properties); + List<E> results = findAllByQuery(query); + return results; } @Override public List<E> findAllByQuery(TopiaQuery query) throws TopiaException { - return query.executeToEntityList(context, getEntityClass()); + List<E> results = query.executeToEntityList(context, getEntityClass()); + return results; } @Override public Map<String, E> findAllMappedByQuery(TopiaQuery query) throws TopiaException { - return query.executeToEntityMap(context, getEntityClass()); + Map<String, E> results = + query.executeToEntityMap(context, getEntityClass()); + return results; } @Override public <K> Map<K, E> findAllMappedByQuery(TopiaQuery query, String keyName, Class<K> keyClass) throws TopiaException { - return query.executeToEntityMap(context, getEntityClass(), keyName, - keyClass); + Map<K, E> results = + query.executeToEntityMap(context, getEntityClass(), + keyName, keyClass); + return results; } @Override public List<E> findAllWithOrder(String... propertyNames) throws TopiaException { TopiaQuery query = createQuery().addOrder(propertyNames); - return findAllByQuery(query); + List<E> results = findAllByQuery(query); + return results; } @Override @@ -615,7 +595,7 @@ @Override public boolean existByQuery(TopiaQuery query) throws TopiaException { - int count = query.executeCount(); + int count = countByQuery(query); boolean result = count > 0; return result; } @@ -629,17 +609,20 @@ @Override @Deprecated public long size() throws TopiaException { - return count(); + long result = count(); + return result; } @Override public int count() throws TopiaException { - return countByQuery(createQuery()); + int result = countByQuery(createQuery()); + return result; } @Override public int countByQuery(TopiaQuery query) throws TopiaException { - return query.executeCount(context); + int result = query.executeCount(context); + return result; } /** @@ -778,8 +761,10 @@ * @param properties * @return the list of entities corresponding to the request * @throws TopiaException if any pb + * @deprecated since 2.4 */ @Override + @Deprecated public List<E> findAllContainsProperties(Map<String, Collection<?>> properties) throws TopiaException { List<E> all = findAll(); @@ -833,9 +818,12 @@ return result; } + /** @deprecated since 2.4 */ @Override + @Deprecated public List<E> findAllContainsProperties(String propertyName, - Collection<?> values, Object... others) throws TopiaException { + Collection<?> values, Object... others) + throws TopiaException { Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); properties.put(propertyName, values); Object name = null; Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-26 09:15:19 UTC (rev 1974) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2010-05-26 09:59:37 UTC (rev 1975) @@ -27,18 +27,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topiatest.QueriedEntity; -/** - * - * @author fdesbois - */ +/** @author fdesbois */ public class TopiaQueryTest { private static final Log log = LogFactory.getLog(TopiaQueryTest.class); @@ -52,7 +45,7 @@ query.add(QueriedEntity.TEST_ADD, value); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE testAdd = :testAdd", + "WHERE testAdd = :testAdd", query.fullQuery()); // Test with null paramValue @@ -61,7 +54,7 @@ query.add(QueriedEntity.TEST_ADD, nullValue); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE testAdd IS NULL", + "WHERE testAdd IS NULL", query.fullQuery()); // Test with two paramValues @@ -70,7 +63,7 @@ query.add(QueriedEntity.TEST_ADD, value, value2); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE testAdd IN(:testAdd1, :testAdd2)", + "WHERE testAdd IN(:testAdd1, :testAdd2)", query.fullQuery()); // Test with two paramValues + null @@ -78,14 +71,14 @@ query.add(QueriedEntity.TEST_ADD, value, value2, null); Assert.assertEquals( "FROM org.nuiton.topiatest.QueriedEntity " + - "WHERE (testAdd IN(:testAdd1, :testAdd2) OR testAdd IS NULL)", + "WHERE (testAdd IN(:testAdd1, :testAdd2) OR testAdd IS NULL)", query.fullQuery()); } @Test public void testAddSubQuery() { - // Test 1 : Subquery in select part with two params with different values + // Test 1 : Subquery with two params with different values TopiaQuery query = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, "value1"); // Exist 2 params @@ -94,14 +87,14 @@ TopiaQuery subquery = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, "value2"); - query.addSubQuery("SUM(?)", subquery, true); + query.addSubQuery("Q1 = (?)", subquery); log.debug(query); // Add other params from subquery Assert.assertEquals(4, query.getParams().size()); - // Test 2 : Subquery in select part with two params with different values - // one of both is null + // Test 2 : Subquery with two params with different values + // one of them is null query = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, TopiaQuery.Op.EQ, null); // Exist 0 param (null value) @@ -110,13 +103,13 @@ subquery = new TopiaQuery(QueriedEntity.class). add(QueriedEntity.TEST_ADD, "value1"); - query.addSubQuery("SUM(?)", subquery, true); + query.addSubQuery("Q1 = (?)", subquery); log.debug(query); // Add 2 params from subquery Assert.assertEquals(2, query.getParams().size()); - // Test 3 : Subquery in where part with two params with same value + // Test 3 : Subquery with two params with same value query = new TopiaQuery(QueriedEntity.class, "Q1"). add(QueriedEntity.TEST_ADD, "value1"); // Exist 2 params @@ -125,7 +118,7 @@ subquery = new TopiaQuery(QueriedEntity.class, "Q2"). add(QueriedEntity.TEST_ADD, "value1"); - query.addSubQuery("Q1 = (?)", subquery, false); + query.addSubQuery("Q1 = (?)", subquery); log.debug(query); // Still 2 params Assert.assertEquals(2, query.getParams().size());

1 0

r1974 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework persistence
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 11:15:19 +0200 (Wed, 26 May 2010) New Revision: 1974 Url: http://nuiton.org/repositories/revision/topia/1974 Log: Evo #637 : add count() method in DAO, deprecate size() in TopiaDAO and executeCount() in TopiaQuery Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.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/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 09:12:03 UTC (rev 1973) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-26 09:15:19 UTC (rev 1974) @@ -1128,6 +1128,19 @@ } /** + * DAO must be defined to use this method. + * + * @param select part of the query redefined temporarly for execution. + * @return an Object + * @throws TopiaException for error on query execution + * @see #executeToObject(TopiaContext, String) + */ + public Object executeToObject(String select) throws TopiaException { + validateDAO(); + return executeToObject(dao.getContext(), select); + } + + /** * Execute the query and get an Integer for result. Used only for query with * aggration select which return a Long : COUNT, SUM ... The select is * overriden to get only the right value for return. @@ -1185,19 +1198,6 @@ } /** - * DAO must be defined to use this method. - * - * @param select part of the query redefined temporarly for execution. - * @return an Object - * @throws TopiaException for error on query execution - * @see #executeToObject(TopiaContext, String) - */ - public Object executeToObject(String select) throws TopiaException { - validateDAO(); - return executeToObject(dao.getContext(), select); - } - - /** * 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 and will be * temporarly disabled. The distinct constraint will be manage if necessary @@ -1235,7 +1235,9 @@ * @return an int corresponding to the number of result in the query * @throws TopiaException for error on query execution * @see #executeCount(TopiaContext) + * @deprecated since 2.4, use {@link TopiaDAO#countByQuery(TopiaQuery)} */ + @Deprecated public int executeCount() throws TopiaException { validateDAO(); return executeCount(dao.getContext()); 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-05-26 09:12:03 UTC (rev 1973) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-05-26 09:15:19 UTC (rev 1974) @@ -403,10 +403,30 @@ * * @return le nombre total d'entites existantes * @throws TopiaException if any pb while getting datas + * @deprecated since 2.4 ambiguous name, use {@link #count()} instead. */ + @Deprecated long size() throws TopiaException; /** + * Count the number of existing entities. + * + * @return number of total entities + * @throws TopiaException if any pb while getting datas + * @since 2.4 + */ + int count() throws TopiaException; + + /** + * Count the number of entities based on {@code query}. + * + * @return number of entities filtered by the query + * @throws TopiaException if any pb while getting datas + * @since 2.4 + */ + int countByQuery(TopiaQuery query) throws TopiaException; + + /** * Recherche la classe en utilisant la cle naturelle, chaque champs de la * cle naturelle est une entre de la map passe en argument. * 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-05-26 09:12:03 UTC (rev 1973) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-26 09:15:19 UTC (rev 1974) @@ -624,12 +624,24 @@ * Count number of existing entities using {@link TopiaQuery#executeCount(TopiaContext)} * * @return a long for the number of entities in database + * @deprecated since 2.4 ambiguous name, use {@link #count()} instead. */ @Override + @Deprecated public long size() throws TopiaException { - return createQuery().executeCount(context); + return count(); } + @Override + public int count() throws TopiaException { + return countByQuery(createQuery()); + } + + @Override + public int countByQuery(TopiaQuery query) throws TopiaException { + return query.executeCount(context); + } + /** * Convert a properties array to a proper map used to find entities in * methods {@link #findByProperties(String, Object, Object...)} and {@link

1 0

r1973 - trunk/topia-persistence/src/test/java/org/nuiton/topiatest
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 11:12:03 +0200 (Wed, 26 May 2010) New Revision: 1973 Url: http://nuiton.org/repositories/revision/topia/1973 Log: Add missing test implementation for Evo #636 Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java 2010-05-26 09:12:03 UTC (rev 1973) @@ -0,0 +1,16 @@ +package org.nuiton.topiatest; + +import org.nuiton.topia.TopiaException; + +/** + * Created: 26 mai 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +public class ExtraDAOEntityDAOImpl<E extends ExtraDAOEntity> extends ExtraDAOEntityDAOAbstract<E> { + + @Override + public void extra() throws TopiaException { + } +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/ExtraDAOEntityDAOImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1972 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/xmi
by fdesbois＠users.nuiton.org 26 May '10

26 May '10

Author: fdesbois Date: 2010-05-26 11:01:27 +0200 (Wed, 26 May 2010) New Revision: 1972 Url: http://nuiton.org/repositories/revision/topia/1972 Log: Evo #636 : Use dependency for extra operations on entity DAO Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-25 16:48:59 UTC (rev 1971) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-26 09:01:27 UTC (rev 1972) @@ -34,6 +34,9 @@ import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -78,6 +81,13 @@ Map<ObjectModelClass, Set<ObjectModelClass>> usages; + /** + * Map of extra operations for DAO. The key of the map is the qualified + * name of the entity relative to the DAO. + */ + Map<String, Collection<ObjectModelOperation>> extraOperations = + new HashMap<String, Collection<ObjectModelOperation>>(); + @Override public void transformFromModel(ObjectModel model) { @@ -85,6 +95,44 @@ } @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { + return; + } + + // Extra operations from <<dao>> interfacez + collectExtraOperations(interfacez); + } + + /** + * EVO #636 : Manage extra operations for DAO from "dao" dependency + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). + * + * @param interfacez The interface with <<dao>> stereotype + */ + protected void collectExtraOperations(ObjectModelInterface interfacez) { + ObjectModelDependency dependency = + interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + + ObjectModelClassifier classifier = dependency.getSupplier(); + + if (classifier.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { + + // Only direct operations will be used. No need to have more + // operations. + Collection<ObjectModelOperation> operations = + interfacez.getOperations(); + + if (log.isDebugEnabled()) { + log.debug("add extra operations for DAO"); + } + + extraOperations.put(classifier.getQualifiedName(), operations); + } + } + + @Override public void transformFromClass(ObjectModelClass clazz) { if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { return; @@ -833,15 +881,29 @@ return false; } - public static Collection<ObjectModelOperation> getDAOOperations( + public Collection<ObjectModelOperation> getDAOOperations( ObjectModelClass clazz) { + // Note : this collection will contains extra operations for DAO. + // Overriding existing generated methods is not managed yet Collection<ObjectModelOperation> results = new ArrayList<ObjectModelOperation>(); + + // This code will be deprecated for (ObjectModelOperation op : clazz.getOperations()) { if (op.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { results.add(op); } } + // New method : interface dependency + Collection<ObjectModelOperation> extra = + extraOperations.get(clazz.getQualifiedName()); + + if (extra != null) { + for (ObjectModelOperation op : extra) { + results.add(op); + } + } + return results; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2010-05-25 16:48:59 UTC (rev 1971) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2010-05-26 09:01:27 UTC (rev 1972) @@ -27,8 +27,14 @@ import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelClassifier; +import org.nuiton.eugene.models.object.ObjectModelDependency; +import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; +import java.util.ArrayList; +import java.util.List; + /** * Created: 14 déc. 2009 * @@ -39,7 +45,36 @@ */ public class DAOImplTransformer extends ObjectModelTransformerToJava { + /** + * Collection used to identify entities full qualified name that have + * a dependency for DAO extra operations. So no need to generate the + * DAOImpl in this case, it will be created by the developper. + */ + List<String> noGenerationNeeded = new ArrayList<String>(); + @Override + public void transformFromInterface(ObjectModelInterface interfacez) { + if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { + return; + } + + /** + * EVO #636 : Manage extra operations for DAO from "dao" dependency + * between an interface with stereotype <<dao>> (dependency client) and + * a class with stereotype <<entity>> (dependency supplier). + */ + + ObjectModelDependency dependency = + interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + + ObjectModelClassifier classifier = dependency.getSupplier(); + + if (classifier.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { + noGenerationNeeded.add(classifier.getQualifiedName()); + } + } + + @Override public void transformFromClass(ObjectModelClass clazz) { if (!clazz.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY) || hasDAOOperations(clazz)) { return; @@ -62,12 +97,17 @@ * @param clazz The ObjectModelClass with operations (Corresponding to the Entity) * @return true if the class has some dao operations, false if not */ - public static boolean hasDAOOperations(ObjectModelClass clazz) { + public boolean hasDAOOperations(ObjectModelClass clazz) { + // This code will be deprecated for (ObjectModelOperation op : clazz.getOperations()) { if (op.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_DAO)) { return true; } } + // New method : interface dependency + if (noGenerationNeeded.contains(clazz.getQualifiedName())) { + return true; + } return false; } } 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-05-25 16:48:59 UTC (rev 1971) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-05-26 09:01:27 UTC (rev 1972) @@ -114,6 +114,11 @@ */ public static final String STEREOTYPE_ARRAY = "array"; /** + * dependency to add extra operations for entity dao. + * @since 2.4 + */ + public static final String DEPENDENCIES_DAO = "dao"; + /** * Tag pour le type de persistence */ public static final String TAG_PERSISTENCE_TYPE = "persistenceType"; Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0