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

r2341 - trunk
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 13:55:49 +0200 (Thu, 22 Sep 2011) New Revision: 2341 Url: http://nuiton.org/repositories/revision/topia/2341 Log: T?\195?\162che #1739: Updates to eugene 2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 10:19:23 UTC (rev 2340) +++ trunk/pom.xml 2011-09-22 11:55:49 UTC (rev 2341) @@ -67,7 +67,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.4-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.4</eugeneVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion>

1 0

r2340 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 12:19:23 +0200 (Thu, 22 Sep 2011) New Revision: 2340 Url: http://nuiton.org/repositories/revision/topia/2340 Log: Anomalie #1641: Cannot use MyDAO.create(My.PROPERTY_CLIENT) with isClient() method Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java 2011-09-22 10:19:01 UTC (rev 2339) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java 2011-09-22 10:19:23 UTC (rev 2340) @@ -25,19 +25,23 @@ package org.nuiton.topia.generator; -import java.util.ArrayList; -import java.util.List; - +import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.validator.ObjectModelValidator; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * Validateur qui valide : - * - les types des attributs - * - les nom des attributs - * - les duplication d'attibuts + * - les types des attributs + * - les nom des attributs + * - les duplication d'attibuts * * @author chatellier <chatellier(a)codelutin.com> * @version $Id$ @@ -46,7 +50,7 @@ /** * Constructor. - * + * * @param model model to validate */ public TopiaJavaValidator(ObjectModel model) { @@ -61,20 +65,20 @@ // type null ou vide if (attr.getType() == null || attr.getType().isEmpty()) { isValid = false; - + addError(attr, "Invalid type \"" + attr.getType() + "\""); } // name = java reserved keywords if (!isJavaIdentifier(attr.getName())) { isValid = false; - + addError(attr, "Attribute name " + attr.getName() - + " is not valid java identifier"); + + " is not valid java identifier"); } // test sur les mots réservés ? - + return isValid; } @@ -83,33 +87,59 @@ protected boolean validateClass(ObjectModelClass clazz) { boolean isValid = super.validateClass(clazz); - + // test attribute names duplication - List<String> attributesName = new ArrayList<String>(); - for(ObjectModelAttribute attr : clazz.getAttributes()) { - if(attributesName.contains(attr.getName())) { - addError(attr, "Attribute name " + attr.getName() - + " already exists"); - + Set<String> attributesName = new HashSet<String>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (!attr.isNavigable()) { + + // not navigable, so will not use it... + continue; + } + String attrName = attr.getName(); + if (!attributesName.add(attrName)) { + addError(attr, "Attribute name " + attrName + + " already exists"); + isValid = false; } - else { - attributesName.add(attr.getName()); + } + + if (TopiaGeneratorUtil.isEntity(clazz)) { + + Set<String> methodsName = new HashSet<String>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + + String capitalizeAttrName = StringUtils.capitalize(attr.getName()); + methodsName.add(TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX + capitalizeAttrName); + methodsName.add(TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX + capitalizeAttrName); + methodsName.add("set" + capitalizeAttrName); } + + // test if there is a method an already reserved name + for (ObjectModelOperation operation : clazz.getOperations()) { + String operationName = operation.getName(); + if (methodsName.contains(operationName)) { + addError(operation, "Operation name " + operationName + + " is already reserved for a getter/setter of an entity attribute"); + + isValid = false; + } + } } - + return isValid; } @Override protected boolean validateModel(ObjectModel model) { - + return super.validateModel(model); } /** * Returns true if s is a legal Java identifier. - * + * * @param s string to test * @return true if s is a legal Java identifier */

1 0

r2339 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 12:19:01 +0200 (Thu, 22 Sep 2011) New Revision: 2339 Url: http://nuiton.org/repositories/revision/topia/2339 Log: Evolution #1747: Model errors validation should not be displayed as info! at least they are warning Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2011-09-22 09:39:31 UTC (rev 2338) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2011-09-22 10:19:01 UTC (rev 2339) @@ -103,8 +103,8 @@ for (ObjectModelValidator validator : validators) { if (!validator.validate()) { for (String error : validator.getErrors()) { - if (log.isInfoEnabled()) { - log.info("[VALIDATION] " + error); + if (log.isWarnEnabled()) { + log.warn("[VALIDATION] " + error); } } }

1 0

r2338 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 11:39:31 +0200 (Thu, 22 Sep 2011) New Revision: 2338 Url: http://nuiton.org/repositories/revision/topia/2338 Log: fix serialVersionUID generation (miss the L) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2011-09-22 09:03:20 UTC (rev 2337) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-22 09:39:31 UTC (rev 2338) @@ -203,7 +203,7 @@ if (svUID == null) { // use a default one - svUID = "" + TopiaGeneratorUtil.generateSerialVersionUID(ouput); + svUID = TopiaGeneratorUtil.generateSerialVersionUID(ouput) + "L"; } addConstant(ouput, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE);

1 0

r2337 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 11:03:20 +0200 (Thu, 22 Sep 2011) New Revision: 2337 Url: http://nuiton.org/repositories/revision/topia/2337 Log: Use generated serialVersionUID from eugene Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2011-09-21 22:20:20 UTC (rev 2336) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-22 09:03:20 UTC (rev 2337) @@ -176,16 +176,39 @@ generateToStringOperation(input); } + // Generate serialVersionUID on abstract class + generateSerialVersionUID(input, outputAbstract); + // Generate Entity Implementation class boolean generateImpl = isGenerateImpl(input, input.getOperations()); if (generateImpl) { generateImpl(input); + generateSerialVersionUID(input, outputImpl); } + + // Clean data output after transformation clean(); } + protected void generateSerialVersionUID(ObjectModelClass input, + ObjectModelClass ouput) { + + // serialVersionUID + String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, + input, + model + ); + if (svUID == null) { + + // use a default one + svUID = "" + TopiaGeneratorUtil.generateSerialVersionUID(ouput); + } + addConstant(ouput, SERIAL_VERSION_UID, long.class, svUID, + ObjectModelModifier.PRIVATE); + } + protected void createEntityInterface(ObjectModelClass input) { outputInterface = createInterface(input.getName(), @@ -278,19 +301,6 @@ setSuperClass(outputAbstract, TopiaEntityAbstract.class); } - // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, - input, - model - ); - if (svUID == null) { - - // use a default one - svUID = "1L"; - } - addConstant(outputAbstract, SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); - addContextableMethods(input, outputAbstract); } @@ -386,16 +396,6 @@ setDocumentation(outputImpl, "Implantation des operations pour l'entité " + input.getName() + "."); setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); - - String svUID = - TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model); - if (svUID == null) { - - // use a default one - svUID = "1L"; - } - addConstant(outputImpl, SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); } /**

1 0

r2336 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/java/org/nuiton/topiatest test/xmi
by tchemit＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: tchemit Date: 2011-09-22 00:20:20 +0200 (Thu, 22 Sep 2011) New Revision: 2336 Url: http://nuiton.org/repositories/revision/topia/2336 Log: Anomalie #1732: Cannot compile with N multiplicity to an enumeration Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java trunk/topia-persistence/src/test/xmi/topiatest.zargo 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 2011-09-21 18:13:28 UTC (rev 2335) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -615,8 +615,7 @@ // getXXX addMultipleGetOperation(attribute, collectionInterface); - if (!TopiaGeneratorUtil.isPrimitiveType(attribute) && - !TopiaGeneratorUtil.isDateType(attribute)) { + if (TopiaGeneratorUtil.isEntity(attribute, model)) { // getXXXByTopiaId addMultipleGetTopiaIdOperation(attribute); 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 2011-09-21 18:13:28 UTC (rev 2335) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -101,8 +101,8 @@ * The Eugene provider of tag values and stereotypes. * * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" role-hint="topia" * @since 2.3 - * @plexus.component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" role-hint="topia" */ public static class TopiaModelPropertiesProvider extends ModelPropertiesUtil.ModelPropertiesProvider { @@ -823,7 +823,7 @@ /** * Retourne true si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} * à la valeur {@code true}. - * + * * @param classifier classifier to test * @return {@code true} si {@link TopiaTagValues#TAG_CONTEXTABLE} == {@code true} */ @@ -970,7 +970,7 @@ fqns.remove(VOID_TYPE); int packageLength = packageName.length(); List<String> genericType = new ArrayList<String>(); - for (Iterator<String> it = fqns.iterator(); it.hasNext();) { + for (Iterator<String> it = fqns.iterator(); it.hasNext(); ) { String fqn = it.next(); int lastIndex = fqn.lastIndexOf("."); if (lastIndex == packageLength && fqn.startsWith(packageName)) { @@ -993,7 +993,7 @@ /** * Obtain the class to use as abstract dao. - * + * <p/> * It will look after a tag value {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} in model * and if not found will use the default value which is {@link TopiaDAOImpl}. * @@ -1081,7 +1081,7 @@ } public static boolean isImportNeeded(Collection<ObjectModelOperation> operations, - String importName) { + String importName) { if (CollectionUtils.isNotEmpty(operations)) { for (ObjectModelOperation op : operations) { if (op.getReturnType().contains(importName)) { @@ -1135,17 +1135,38 @@ } /** + * Check if the given attribute type is an entity. + * + * @param attribute attribute to test + * @param model model containing the attribute + * @return {@code true} if type of attribute is an entity, + * {@code false} otherwise + * @see TopiaStereoTypes#STEREOTYPE_ENTITY + * @since 2.7 + */ + public static boolean isEntity(ObjectModelAttribute attribute, + ObjectModel model) { + if (isPrimitiveType(attribute)) { + return false; + } + String attributeType = attribute.getType(); + ObjectModelClassifier typeclassifier = + model.getClassifier(attributeType); + return typeclassifier != null && isEntity(typeclassifier); + } + + /** * Check if the given classifier has the * {@link TopiaStereoTypes#STEREOTYPE_ENTITY} and is not an enumeration * * @param classifier classifier to test * @return {@code true} if stereotype was found and classifier is not - * enumeration, {@code false} otherwise + * enumeration, {@code false} otherwise * @see TopiaStereoTypes#STEREOTYPE_ENTITY * @since 2.5 */ public static boolean isEntity(ObjectModelClassifier classifier) { - return hasEntityStereotype(classifier) && ! classifier.isEnum(); + return hasEntityStereotype(classifier) && !classifier.isEnum(); } @@ -1732,7 +1753,7 @@ * <p/> * * @param classifier classifier to seek - * @param model model to seek + * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. * @see TopiaTagValues#TAG_NO_LOG_IN_SERVICE * @since 2.5 @@ -1744,7 +1765,7 @@ return value; } - /** + /** * Obtain the value of the {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} * tag value on the given model. * <p/> Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java 2011-09-21 18:13:28 UTC (rev 2335) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -25,5 +25,5 @@ package org.nuiton.topiatest; public enum Gender { - MALE, FEMALE; + MALE, FEMALE } Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -0,0 +1,13 @@ +package org.nuiton.topiatest; + +/** + * To test http://nuiton.org/issues/1732. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.2 + */ +public enum Title { + Mr, + Madam, + Other +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r2335 - trunk/topia-persistence
by tchemit＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: tchemit Date: 2011-09-21 20:13:28 +0200 (Wed, 21 Sep 2011) New Revision: 2335 Url: http://nuiton.org/repositories/revision/topia/2335 Log: onyl invoke its at release due to MINVOKER-107 Modified: trunk/topia-persistence/pom.xml Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-21 07:43:37 UTC (rev 2334) +++ trunk/topia-persistence/pom.xml 2011-09-21 18:13:28 UTC (rev 2335) @@ -305,8 +305,11 @@ <id>run-its</id> <activation> <property> - <name>maven.test.skip</name> - <value>!false</value> + <name>performRelease</name> + <value>true</value> +  +  </property> </activation> <build>

1 0

r2334 - trunk/topia-persistence/src/test/java/org/nuiton/topia/framework
by athimel＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: athimel Date: 2011-09-21 09:43:37 +0200 (Wed, 21 Sep 2011) New Revision: 2334 Url: http://nuiton.org/repositories/revision/topia/2334 Log: Invert assertEquals............ Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 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 2011-09-21 07:40:09 UTC (rev 2333) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2011-09-21 07:43:37 UTC (rev 2334) @@ -158,9 +158,9 @@ log.debug("Query : " + query); - Assert.assertEquals(query.fullQuery(), - "FROM " + QueriedEntity.class.getName() + - " ORDER BY " + QueriedEntity.PROPERTY_TEST_ADD); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + + " ORDER BY " + QueriedEntity.PROPERTY_TEST_ADD, + query.fullQuery()); filter.setOrderBy(null); @@ -168,19 +168,24 @@ log.debug("Query : " + query); - Assert.assertEquals(query.fullQuery(), - "FROM " + QueriedEntity.class.getName() + - " ORDER BY " + TopiaEntity.TOPIA_CREATE_DATE + " DESC"); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + + " ORDER BY " + TopiaEntity.TOPIA_CREATE_DATE + " DESC", + query.fullQuery()); } @Test + // cf http://nuiton.org/issues/1745 public void testWhereWithFunction() { + TopiaQuery query = new TopiaQuery(QueriedEntity.class); query.addWhere("lower(name)", TopiaQuery.Op.LIKE, "%azerty%"); + log.debug("Query : " + query); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + - " WHERE lower(name) LIKE :lower_name_", query.fullQuery()); + " WHERE lower(name) LIKE :lower_name_", + query.fullQuery()); } }

1 0

r2333 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia/framework
by athimel＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: athimel Date: 2011-09-21 09:40:09 +0200 (Wed, 21 Sep 2011) New Revision: 2333 Url: http://nuiton.org/repositories/revision/topia/2333 Log: #1745 Cannot use a function on TopiaQuery Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.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 2011-09-13 10:09:10 UTC (rev 2332) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2011-09-21 07:40:09 UTC (rev 2333) @@ -735,6 +735,11 @@ if (dot != -1) { valueName = paramName.substring(dot + 1); } + + // If the paramName contains a function, escape parenthesis + valueName = valueName.replace('(', '_'); + valueName = valueName.replace(')', '_'); + if (getParams().contains(valueName)) { valueName = valueName + "_" + RandomStringUtils.randomAlphanumeric(4); 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 2011-09-13 10:09:10 UTC (rev 2332) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2011-09-21 07:40:09 UTC (rev 2333) @@ -174,4 +174,13 @@ } + @Test + public void testWhereWithFunction() { + TopiaQuery query = new TopiaQuery(QueriedEntity.class); + query.addWhere("lower(name)", TopiaQuery.Op.LIKE, "%azerty%"); + log.debug("Query : " + query); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + + " WHERE lower(name) LIKE :lower_name_", query.fullQuery()); + } + }

1 0

r2332 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 13 Sep '11

13 Sep '11

Author: tchemit Date: 2011-09-13 12:09:10 +0200 (Tue, 13 Sep 2011) New Revision: 2332 Url: http://nuiton.org/repositories/revision/topia/2332 Log: change log level Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-09-12 14:43:31 UTC (rev 2331) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-09-13 10:09:10 UTC (rev 2332) @@ -117,7 +117,6 @@ poolSize = PropertiesHelper.getInt(Environment.POOL_SIZE, props, 20); //default pool size 20 if (log.isDebugEnabled()) { - log.debug("Connection pool size: " + poolSize); } @@ -167,14 +166,14 @@ connectionProps = ConnectionProviderFactory.getConnectionProperties(props); - if (log.isInfoEnabled()) { - log.info("using driver: " + driverClass + " at URL: " + url); + if (log.isDebugEnabled()) { + log.debug("using driver: " + driverClass + " at URL: " + url); } // if debug level is enabled, then log the password, otherwise mask it - if (log.isDebugEnabled()) { - log.info("connection properties: " + connectionProps); - } else if (log.isInfoEnabled()) { - log.info("connection properties: " + + if (log.isTraceEnabled()) { + log.debug("connection properties: " + connectionProps); + } else if (log.isDebugEnabled()) { + log.debug("connection properties: " + PropertiesHelper.maskOut(connectionProps, "password")); } } @@ -279,8 +278,8 @@ @Override public void close() { - if (log.isInfoEnabled()) { - log.info("cleaning up connection pool: " + url); + if (log.isDebugEnabled()) { + log.debug("cleaning up connection pool: " + url); } for (Connection connection : pool) {

1 0