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

r2431 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: maven-release Date: 2012-03-29 11:47:07 +0200 (Thu, 29 Mar 2012) New Revision: 2431 Url: http://nuiton.org/repositories/revision/topia/2431 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 09:47:05 UTC (rev 2430) +++ trunk/pom.xml 2012-03-29 09:47:07 UTC (rev 2431) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -443,9 +443,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.9</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.9</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.9</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-03-29 09:47:05 UTC (rev 2430) +++ trunk/topia-persistence/pom.xml 2012-03-29 09:47:07 UTC (rev 2431) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-03-29 09:47:05 UTC (rev 2430) +++ trunk/topia-service-migration/pom.xml 2012-03-29 09:47:07 UTC (rev 2431) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-03-29 09:47:05 UTC (rev 2430) +++ trunk/topia-service-replication/pom.xml 2012-03-29 09:47:07 UTC (rev 2431) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-03-29 09:47:05 UTC (rev 2430) +++ trunk/topia-service-security/pom.xml 2012-03-29 09:47:07 UTC (rev 2431) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9</version> + <version>2.6.10-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2430 - in tags: . topia-2.6.9
by maven-release＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: maven-release Date: 2012-03-29 11:47:05 +0200 (Thu, 29 Mar 2012) New Revision: 2430 Url: http://nuiton.org/repositories/revision/topia/2430 Log: [maven-release-plugin] copy for tag topia-2.6.9 Added: tags/topia-2.6.9/ Property changes on: tags/topia-2.6.9 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2429 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: maven-release Date: 2012-03-29 11:47:03 +0200 (Thu, 29 Mar 2012) New Revision: 2429 Url: http://nuiton.org/repositories/revision/topia/2429 Log: [maven-release-plugin] prepare release topia-2.6.9 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 09:44:46 UTC (rev 2428) +++ trunk/pom.xml 2012-03-29 09:47:03 UTC (rev 2429) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> <modules> <module>topia-persistence</module> @@ -443,9 +443,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.9</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.9</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.9</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2012-03-29 09:44:46 UTC (rev 2428) +++ trunk/topia-persistence/pom.xml 2012-03-29 09:47:03 UTC (rev 2429) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2012-03-29 09:44:46 UTC (rev 2428) +++ trunk/topia-service-migration/pom.xml 2012-03-29 09:47:03 UTC (rev 2429) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2012-03-29 09:44:46 UTC (rev 2428) +++ trunk/topia-service-replication/pom.xml 2012-03-29 09:47:03 UTC (rev 2429) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-03-29 09:44:46 UTC (rev 2428) +++ trunk/topia-service-security/pom.xml 2012-03-29 09:47:03 UTC (rev 2429) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.9-SNAPSHOT</version> + <version>2.6.9</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2428 - trunk
by tchemit＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: tchemit Date: 2012-03-29 11:44:46 +0200 (Thu, 29 Mar 2012) New Revision: 2428 Url: http://nuiton.org/repositories/revision/topia/2428 Log: fixes #2041 (Updates to mavenpom 3.2) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 09:41:09 UTC (rev 2427) +++ trunk/pom.xml 2012-03-29 09:44:46 UTC (rev 2428) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <artifactId>topia</artifactId>

1 0

r2427 - trunk
by tchemit＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: tchemit Date: 2012-03-29 11:41:09 +0200 (Thu, 29 Mar 2012) New Revision: 2427 Url: http://nuiton.org/repositories/revision/topia/2427 Log: refs #2010 (updates nuiton-utils to 2.4.6 + h2 to 1.3.165) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 00:15:57 UTC (rev 2426) +++ trunk/pom.xml 2012-03-29 09:41:09 UTC (rev 2427) @@ -68,14 +68,14 @@  <eugeneVersion>2.4.2</eugeneVersion> - <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.6</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>3.6.10.Final</hibernateVersion>  <sl4jVersion>1.6.4</sl4jVersion> - <h2Version>1.3.163</h2Version> + <h2Version>1.3.165</h2Version>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles>

1 0

r2426 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence persistence/util
by tchemit＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: tchemit Date: 2012-03-29 02:15:57 +0200 (Thu, 29 Mar 2012) New Revision: 2426 Url: http://nuiton.org/repositories/revision/topia/2426 Log: fixes #2040 (Manage in the EntityEnum contract the properties marked as not-null) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-03-20 13:34:53 UTC (rev 2425) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2012-03-29 00:15:57 UTC (rev 2426) @@ -25,6 +25,7 @@ package org.nuiton.topia.generator; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelType; @@ -97,6 +98,7 @@ addImport(entityEnum, EntityOperatorStore.class); addImport(entityEnum, Arrays.class); addImport(entityEnum, TopiaRuntimeException.class); + addImport(entityEnum, ArrayUtils.class); } else { entityEnum = (ObjectModelEnumerationImpl) @@ -108,6 +110,7 @@ addImport(daoHelper, TopiaEntityEnum.class); addImport(daoHelper, EntityOperatorStore.class); addImport(daoHelper, Arrays.class); + addImport(daoHelper, ArrayUtils.class); } // generate DAOHelper @@ -316,22 +319,33 @@ Collection<ObjectModelAttribute> attributes = clazz.getAttributes(); boolean withNatural = false; - StringBuilder sb = new StringBuilder(); + boolean withNotNull = false; + StringBuilder naturalIdsParams = new StringBuilder(); + StringBuilder notNullParams = new StringBuilder(); for (ObjectModelAttribute attr2 : attributes) { if (TopiaGeneratorUtil.isNaturalId(attr2)) { withNatural = true; // attribut metier - sb.append(", \"").append(attr2.getName()).append("\""); + naturalIdsParams.append(", \"").append(attr2.getName()).append("\""); } + if (TopiaGeneratorUtil.isNotNull(attr2)) { + withNotNull = true; + // attribut not-null + notNullParams.append(", \"").append(attr2.getName()).append("\""); + } } - if (withNatural) { - String naturalIds = sb.substring(2); - addLiteral(entityEnum, clazzName + '(' + clazzName + ".class, " + naturalIds + ")"); + StringBuilder params = new StringBuilder(clazzName + ".class"); + if (withNotNull) { + params.append(", new String[]{ " + notNullParams.substring(2) + " }"); } else { - addLiteral(entityEnum, clazzName + '(' + clazzName + ".class)"); + params.append(", ArrayUtils.EMPTY_STRING_ARRAY"); } + if (withNatural) { + params.append(", ").append(naturalIdsParams.substring(2)); + } + addLiteral(entityEnum, clazzName + '(' + params.toString() + ')'); if (generateStandaloneEnum) { addImport(entityEnum, clazz); @@ -350,13 +364,18 @@ attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "naturalIds", "String[]"); attr.setDocumentation("The array of property involved in the natural key of the entity."); + attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "notNulls", "String[]"); + attr.setDocumentation("The array of not null properties of the entity."); + // constructor op = addConstructor(entityEnum, ObjectModelModifier.PACKAGE); addParameter(op,"Class<? extends TopiaEntity >","contract"); + addParameter(op,"String[]","notNulls"); addParameter(op,"String...","naturalIds"); setOperationBody(op, "" /*{ this.contract = contract; + this.notNulls = notNulls; this.naturalIds = naturalIds; implementationFQN = contract.getName() + "Impl"; }*/ @@ -371,7 +390,7 @@ }*/ ); - // getContract method + // getNaturalIds method op = addOperation(entityEnum, "getNaturalIds", "String[]", ObjectModelModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); setOperationBody(op, "" @@ -380,6 +399,33 @@ }*/ ); + // isUseNaturalIds method + op = addOperation(entityEnum, "isUseNaturalIds", "boolean", ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + return naturalIds.length > 0; + }*/ + ); + + // getNotNulls method + op = addOperation(entityEnum, "getNotNulls", "String[]", ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + return notNulls; + }*/ + ); + + // isUseNotNulls method + op = addOperation(entityEnum, "isUseNotNulls", "boolean", ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + return notNulls.length > 0; + }*/ + ); + // getImplementationFQN method op = addOperation(entityEnum, "getImplementationFQN","String",ObjectModelModifier.PUBLIC); addAnnotation(entityEnum,op,Override.class.getSimpleName()); 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 2012-03-20 13:34:53 UTC (rev 2425) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-03-29 00:15:57 UTC (rev 2426) @@ -443,6 +443,28 @@ } /** + * Detecte si un attribut est marué comme non null. + * + * @param attribute l'attribut à tester + * @return {@code true} si l'attribut doit être non null, {@code false} sinon.. + * @since 2.6.9 + */ + public static boolean isNotNull(ObjectModelAttribute attribute) { + String value = getNotNullTagValue(attribute); + if (StringUtils.isEmpty(value)) { + // valeur null, donc pas positionnee + return false; + } + try { + return Boolean.valueOf(value.trim()); + } catch (Exception e) { + // on a pas reussi a convertir en boolean. + //todo peut-être declancher une exception ? + return false; + } + } + + /** * Cherches et renvoie le copyright a utiliser sur le model. * * @param model le modele utilisé Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java 2012-03-20 13:34:53 UTC (rev 2425) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java 2012-03-29 00:15:57 UTC (rev 2426) @@ -29,19 +29,19 @@ /** * The contract to be realised by the generated enumeration in any DAOHelper. - * + * * Example : for a model Test, we will have a * <code>TestDOAHelper.TestEntityEnum</code> enumeration generated. - * + * * The contract gives some informations about the classes for any entity dealed * by the dao helper. More precisely : - * + * * - contract class of the entity (this must be an interface class) * - the implementation fqn class of an entity (at generation time, we might - * not have the implementation class) + * not have the implementation class) * - the implementation class (will be looked up at runtime execution, in that - * way we make possible to used a different implementation at runtime. - * + * way we make possible to used a different implementation at runtime. + * * - a method to accept any TopiaEntity class for this entity description * * @author tchemit <chemit(a)codelutin.com> @@ -50,10 +50,7 @@ */ public interface TopiaEntityEnum extends Serializable { - /** - * - * @return the contract class of the entity - */ + /** @return the contract class of the entity */ Class<? extends TopiaEntity> getContract(); /** @@ -63,37 +60,51 @@ */ Class<? extends TopiaEntity> getImplementation(); - /** - * - * @return the fully qualifed name of the implementation class of the entity - */ + /** @return the fully qualifed name of the implementation class of the entity */ String getImplementationFQN(); /** - * * @return the array of property names involved in the natural key - * of the entity. + * of the entity. */ String[] getNaturalIds(); - + /** + * @return the array of property names which are marked as not-null. + * @since 2.6.9 + */ + String[] getNotNulls(); + + /** + * @return {@code true} if entity use natural ids, {@code false} otherwise. + * @since 2.6.9 + */ + boolean isUseNaturalIds(); + + /** + * @return {@code true} if entity use some not-null properties, + * {@code false} otherwise. + * @since 2.6.9 + */ + boolean isUseNotNulls(); + + /** * Change the implementation class of the entity. - * + * * Note : this method should reset all states of the objet - * (implementation class, operators,...). + * (implementation class, operators,...). * * @param implementationFQN the new fully qualifed name of the new - * implementation class of the entity. + * implementation class of the entity. */ void setImplementationFQN(String implementationFQN); /** - * * Test if a given type of entity is matching the contract of this entity. - * + * * Note : make sure to accept type only on the given contract class of this entity, * can not accept an ancestor type, since there is a specific contract for this. - * + * * Example : A -> B * <pre> * EntityEnum.A.accept(Class<A>) -> true @@ -101,10 +112,10 @@ * EntityEnum.B.accept(Class) -> true * EntityEnum.B.accept(Class<A>) -> false * </pre> - * + * * @param klass the type of an entity to test. * @return {@code true} if given type is dealed directly by this entity, - * {@code false} otherwise. + * {@code false} otherwise. */ boolean accept(Class<? extends TopiaEntity> klass); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2012-03-20 13:34:53 UTC (rev 2425) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2012-03-29 00:15:57 UTC (rev 2426) @@ -57,8 +57,8 @@ * permet de modifier ces valeurs : * * {@link #get(String, TopiaEntity)} - * {@link #set(String, TopiaEntity,Object)} - * {@link #copy(String, TopiaEntity,TopiaEntity)} + * {@link #set(String, TopiaEntity, Object)} + * {@link #copy(String, TopiaEntity, TopiaEntity)} * {@link #getChild(String, TopiaEntity, String)} * {@link #addChild(String, TopiaEntity, Object)} * {@link #removeChild(String, TopiaEntity, Object)} @@ -73,8 +73,8 @@ * * Note : cet objet ne permet pas d'operation vers les bases. * + * @param type de l'entite * @author tchemit <chemit(a)codelutin.com> - * @param type de l'entite * @since 2.2.0 */ public class EntityOperator { @@ -88,6 +88,14 @@ /** list of property names available on the entity. */ protected List<String> properties; + /** + * list of property names available on the entity used in a natural ids or + * marked as not-null. + * + * @since 2.6.9 + */ + protected Set<String> naturalIdsOnNotNullsProperties; + /** list of association names available on the entity. */ protected List<String> associationProperties; @@ -162,6 +170,7 @@ * * @param bean le bean a inspecter * @return le dictionnaire de la clef naturel du bean + * @see TopiaEntityEnum#getNaturalIds() * @since 2.4.1 */ public Map<String, Object> getNaturalId(B bean) { @@ -176,6 +185,59 @@ } /** + * Pour obtenir un dictionnaire des propriétés marqués not-null du + * {@code bean} donne. + * + * @param bean le bean a inspecter + * @return le dictionnaire des propriétés marquées not-null du bean + * @see TopiaEntityEnum#getNotNulls() + * @since 2.6.9 + */ + public Map<String, Object> getNotNull(B bean) { + Map<String, Object> result = new TreeMap<String, Object>(); + String[] ids = contract.getNotNulls(); + if (ids != null) { + for (String id : ids) { + result.put(id, get(id, bean)); + } + } + return result; + } + + /** + * Get all properties from a natural id or marked as not-null. + * + * @return all property names froma natural id or marked as not-null + * @since 2.6.9 + */ + public String[] getNaturalIdsOnNotNullsProperties() { + return naturalIdsOnNotNullsProperties.toArray(new String[naturalIdsOnNotNullsProperties.size()]); + } + + /** + * Pour obtenir un dictionnaire des propriétés marqués not-null et la clef naturelle + * du {@code bean} donne. + * + * Cette methode est utilisée pour faire un dao.create, pour s'assurer que + * tout ce qui ne doit pas pas être à null est bien fourni à la création de + * l'objet, sinon on obtient des erreurs. + * + * @param bean le bean a inspecter + * @return le dictionnaire des propriétés marquées not-null + la clef + * naturelle du bean + * @see TopiaEntityEnum#getNotNulls() + * @see TopiaEntityEnum#getNaturalIds() + * @since 2.6.9 + */ + public Map<String, Object> getNaturalIsdAndNotNulls(B bean) { + Map<String, Object> result = new TreeMap<String, Object>(); + for (String id : naturalIdsOnNotNullsProperties) { + result.put(id, get(id, bean)); + } + return result; + } + + /** * Copie une propriete de src vers dst. * * Note : cela apellera la methode <code>setXXX(value)</code>. @@ -436,6 +498,7 @@ protected void finalize() throws Throwable { super.finalize(); properties = null; + naturalIdsOnNotNullsProperties = null; associationProperties = null; getMethods = null; setMethods = null; @@ -454,7 +517,7 @@ } protected Collection<String> getProperties(String[] properties) { - Collection<String> names = null; + Collection<String> names; if (properties.length == 0) { names = this.properties; } else { @@ -497,7 +560,7 @@ Set<Class<?>> explored = new HashSet<Class<?>>(); properties = new ArrayList<String>(); associationProperties = new ArrayList<String>(); - + naturalIdsOnNotNullsProperties = new HashSet<String>(); try { @@ -531,6 +594,15 @@ associationProperties = Collections.unmodifiableList( associationProperties); } + + if (contract.isUseNaturalIds()) { + Collections.addAll(naturalIdsOnNotNullsProperties, + contract.getNaturalIds()); + } + if (contract.isUseNotNulls()) { + Collections.addAll(naturalIdsOnNotNullsProperties, + contract.getNotNulls()); + } if (log.isDebugEnabled()) { log.debug("===== end for " + getClazz() + " (" + properties.size() + " properties, " +

1 0

r2425 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence/util
by bleny＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: bleny Date: 2012-03-20 14:34:53 +0100 (Tue, 20 Mar 2012) New Revision: 2425 Url: http://nuiton.org/repositories/revision/topia/2425 Log: #2015 Bad index generated with indexForeignKeys for a many-2-many renamed relation Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-03-20 08:48:15 UTC (rev 2424) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-03-20 13:34:53 UTC (rev 2425) @@ -238,7 +238,7 @@ // many to many tableName = TopiaGeneratorUtil.getManyToManyTableName(attribute); - propertyName = TopiaGeneratorUtil.getDbName(attribute.getClassifier()); + propertyName = TopiaGeneratorUtil.getDbName(attribute.getReverseAttribute()); } else { // one to many @@ -249,7 +249,7 @@ <create>CREATE INDEX <%=indexName%> ON <%=tableName%>(<%=propertyName%>)</create> <drop>DROP INDEX <%=indexName%></drop> </database-object> -}*/ +}*/ } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-03-20 08:48:15 UTC (rev 2424) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-03-20 13:34:53 UTC (rev 2425) @@ -122,7 +122,7 @@ * @param entities la liste des entités à scanner * @param topiaId l'id de l'entité recherchée * @param <E> le type de l'entité - * @return l'entité trouvée, ou <code<null</code< si elle n'est pas + * @return l'entité trouvée, ou <code>null</code> si elle n'est pas * trouvée. */ public static <E extends TopiaEntity> E getEntityByTopiaId(

1 0

r2424 - tags/topia-2.6.8/src/site/rst
by maven-release＠users.nuiton.org 20 Mar '12

20 Mar '12

Author: maven-release Date: 2012-03-20 09:48:15 +0100 (Tue, 20 Mar 2012) New Revision: 2424 Url: http://nuiton.org/repositories/revision/topia/2424 Log: revert commit 2423 Modified: tags/topia-2.6.8/src/site/rst/index.rst Modified: tags/topia-2.6.8/src/site/rst/index.rst =================================================================== --- tags/topia-2.6.8/src/site/rst/index.rst 2012-03-19 22:11:37 UTC (rev 2423) +++ tags/topia-2.6.8/src/site/rst/index.rst 2012-03-20 08:48:15 UTC (rev 2424) @@ -1 +1,69 @@ -lPKWH9 <a href="http://hllsshtjjyig.com/">hllsshtjjyig</a>, [url=http://fvnpufwhlgmm.com/]fvnpufwhlgmm[/url] [link=http://qylssssnuxnc.com/]qylssssnuxnc[/link] http://zpgraedaqnwk.com/ \ No newline at end of file +.. - +.. * #%L +.. * ToPIA +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2004 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - +Accueil +======= + +Presentation +------------ + +ToPIA stands for Tools for Portable and Independent Architecture. It is a +technical platform abstraction framework. This documentation is not up-to-date +and in French. We are in the process to update this documentation, we will +translate it in English at the same time. + +Présentation +------------ + +ToPIA, pour Tools for Portable and Independant Architecture, est un framework +d'abstraction des plateformes techniques. + +Constitution +------------ + +Il est actuellement composé d'un module principal : + + * `ToPIA-persistence`_ : pour la gestion de la persistance sur hibernate + +Depuis la version 2.3.3, le module **ToPIA-soa** n'est plus maintenu. + +Services +-------- + +Depuis la version 2.2.0, ToPIA-service a été intégré au projet ToPIA, chaque service devient un module : + + * `ToPIA-service-migration`_ : service de migration de bases sans perte de données. + * `ToPIA-service-replication`_ : service de replication de données entre 2 bases. + * `ToPIA-service-security`_ : service de sécurité. + +Depuis la version 2.3.3, certains services ne sont plus maintenus (car ils sont à +l'heure actuelle des prototypes et ne sont pas utilisables ad hoc). + + * **ToPIA-service-history** : service d'historisation de données en base. + * **ToPIA-service-index** : service d'indexation de données. + +.. _ToPIA-persistence: ./topia-persistence +.. _ToPIA-service-migration: ./topia-service-migration +.. _ToPIA-service-replication: ./topia-service-replication +.. _ToPIA-service-security: ./topia-service-security

1 0

r2423 - tags/topia-2.6.8/src/site/rst
by bpoussin＠users.nuiton.org 19 Mar '12

19 Mar '12

Author: bpoussin Date: 2012-03-19 23:11:37 +0100 (Mon, 19 Mar 2012) New Revision: 2423 Url: http://nuiton.org/repositories/revision/topia/2423 Log: >From scmwebeditor -- lPKWH9 <a href="http://hllsshtjjyig.com/">hllsshtjjyig</a>, [url=http://fvnpufwhlgmm.com/]fvnpufwhlgmm[/url] [link=http://qylssssnuxnc.com/]qylssssnuxnc[/link] http://zpgraedaqnwk.com/ Modified: tags/topia-2.6.8/src/site/rst/index.rst Modified: tags/topia-2.6.8/src/site/rst/index.rst =================================================================== --- tags/topia-2.6.8/src/site/rst/index.rst 2012-03-14 13:39:41 UTC (rev 2422) +++ tags/topia-2.6.8/src/site/rst/index.rst 2012-03-19 22:11:37 UTC (rev 2423) @@ -1,69 +1 @@ -.. - -.. * #%L -.. * ToPIA -.. * -.. * $Id$ -.. * $HeadURL$ -.. * %% -.. * Copyright (C) 2004 - 2010 CodeLutin -.. * %% -.. * This program is free software: you can redistribute it and/or modify -.. * it under the terms of the GNU Lesser General Public License as -.. * published by the Free Software Foundation, either version 3 of the -.. * License, or (at your option) any later version. -.. * -.. * This program is distributed in the hope that it will be useful, -.. * but WITHOUT ANY WARRANTY; without even the implied warranty of -.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.. * GNU General Lesser Public License for more details. -.. * -.. * You should have received a copy of the GNU General Lesser Public -.. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. -.. * #L% -.. - -Accueil -======= - -Presentation ------------- - -ToPIA stands for Tools for Portable and Independent Architecture. It is a -technical platform abstraction framework. This documentation is not up-to-date -and in French. We are in the process to update this documentation, we will -translate it in English at the same time. - -Présentation ------------- - -ToPIA, pour Tools for Portable and Independant Architecture, est un framework -d'abstraction des plateformes techniques. - -Constitution ------------- - -Il est actuellement composé d'un module principal : - - * `ToPIA-persistence`_ : pour la gestion de la persistance sur hibernate - -Depuis la version 2.3.3, le module **ToPIA-soa** n'est plus maintenu. - -Services --------- - -Depuis la version 2.2.0, ToPIA-service a été intégré au projet ToPIA, chaque service devient un module : - - * `ToPIA-service-migration`_ : service de migration de bases sans perte de données. - * `ToPIA-service-replication`_ : service de replication de données entre 2 bases. - * `ToPIA-service-security`_ : service de sécurité. - -Depuis la version 2.3.3, certains services ne sont plus maintenus (car ils sont à -l'heure actuelle des prototypes et ne sont pas utilisables ad hoc). - - * **ToPIA-service-history** : service d'historisation de données en base. - * **ToPIA-service-index** : service d'indexation de données. - -.. _ToPIA-persistence: ./topia-persistence -.. _ToPIA-service-migration: ./topia-service-migration -.. _ToPIA-service-replication: ./topia-service-replication -.. _ToPIA-service-security: ./topia-service-security +lPKWH9 <a href="http://hllsshtjjyig.com/">hllsshtjjyig</a>, [url=http://fvnpufwhlgmm.com/]fvnpufwhlgmm[/url] [link=http://qylssssnuxnc.com/]qylssssnuxnc[/link] http://zpgraedaqnwk.com/ \ No newline at end of file

1 0

r2422 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org 14 Mar '12

14 Mar '12

Author: tchemit Date: 2012-03-14 14:39:41 +0100 (Wed, 14 Mar 2012) New Revision: 2422 Url: http://nuiton.org/repositories/revision/topia/2422 Log: Evolution #2009: Migrate FilterPagerUtil from nuiton-web Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java 2012-03-14 13:39:41 UTC (rev 2422) @@ -0,0 +1,355 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.topia.persistence; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.util.PagerUtil; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +/** + * Extension of the simple {@link PagerUtil} from nuiton-utils to offer + * order and filter api. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.9 + */ +public class TopiaFilterPagerUtil extends PagerUtil { + + protected TopiaFilterPagerUtil() { + } + + public static TopiaQuery addPagerToQuery(TopiaQuery query, + FilterPagerBean pager) { + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + query.setLimit(pager.getRecordStartIndex(), + pager.getRecordEndIndex() - 1); + + if (StringUtils.isNotEmpty(pager.getSortColumn())) { + if (pager.isSortAscendant()) { + query.addOrder(pager.getSortColumn()); + } else { + query.addOrderDesc(pager.getSortColumn()); + } + } + return query; + } + + public static <E> List<E> getPageFromList(List<E> elements, + FilterPagerBean pager) { + + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + List<E> subList = getPage(elements, pager.getPageIndex(), pager.getPageSize()); + List<E> result = new ArrayList<E>(subList); + + return result; + } + + public static FilterPagerBean newFilterPagerBean() { + return new FilterPagerBean(); + } + + public static class FilterPagerBean extends PagerBean { + + private static final long serialVersionUID = 1L; + + // sorting order - asc or desc + protected boolean sortAscendant; + + // get index row - i.e. user click to sort. + protected String sortColumn; + + protected FilterOperationGroup groupOp; + + private List<FilterRule> rules; + + public boolean canFilter() { + return groupOp != null && CollectionUtils.isNotEmpty(rules); + } + + public FilterOperationGroup getGroupOp() { + return groupOp; + } + + public void setGroupOp(FilterOperationGroup groupOp) { + this.groupOp = groupOp; + } + + public List<FilterRule> getRules() { + return rules; + } + + public void setRules(List<FilterRule> rules) { + this.rules = rules; + } + + public boolean isSortAscendant() { + return sortAscendant; + } + + public void setSortAscendant(boolean sortAscendant) { + this.sortAscendant = sortAscendant; + } + + public String getSortColumn() { + return sortColumn; + } + + public void setSortColumn(String sortColumn) { + this.sortColumn = sortColumn; + } + } + + public static class FilterRule implements Serializable { + + private static final long serialVersionUID = 1L; + + protected final FilterOperation op; + + protected final String field; + + protected final String data; + + public FilterRule(FilterOperation op, + String field, + String data) { + this.op = op; + this.field = field; + this.data = data; + } + + public FilterOperation getOp() { + return op; + } + + public String getField() { + return field; + } + + public String getData() { + return data; + } + } + + public enum FilterOperationGroup { + OR, AND + } + + public enum FilterOperation { + /** Equals operator. */ + eq { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " = :" + paramName; + filterParams.put(paramName, data); + return ruleFilter; + } + }, + /** Not equals operator. */ + ne { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " != :" + paramName; + filterParams.put(paramName, data); + return ruleFilter; + } + }, + /** Contains operator. */ + cn { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " like :" + paramName; + filterParams.put(paramName, "%" + data + "%"); + return ruleFilter; + } + }, + /** Not contains operator. */ + nc { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " not like :" + paramName; + filterParams.put(paramName, "%" + data + "%"); + return ruleFilter; + } + }, + /** Begins with operator. */ + bw { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " like :" + paramName; + filterParams.put(paramName, data + "%"); + return ruleFilter; + } + }, + /** Not between with operator. */ + bn { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " not like :" + paramName; + filterParams.put(paramName, data + "%"); + return ruleFilter; + } + }, + /** Ends with operator. */ + ew { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " like :" + paramName; + filterParams.put(paramName, "%" + data); + return ruleFilter; + } + }, + /** Not End with operator. */ + en { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " not like :" + paramName; + filterParams.put(paramName, "%" + data); + return ruleFilter; + } + }, + /** Lesser than operator. */ + lt { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " < :" + paramName; + filterParams.put(paramName, data); + return ruleFilter; + } + }, + /** Lesser or equals operator. */ + le { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " <= :" + paramName; + filterParams.put(paramName, data); + return ruleFilter; + } + }, + /** Greater than operator. */ + gt { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " > :" + paramName; + filterParams.put(paramName, data); + return ruleFilter; + } + }, + /** Greater or equals operator. */ + ge { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " >= :" + paramName; + filterParams.put(paramName, data); + return ruleFilter; + } + }, + /** Is null operator. */ + nu { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " is null"; + return ruleFilter; + } + }, + /** Is not null operator. */ + nn { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + String ruleFilter = propertyName + " is not null"; + return ruleFilter; + } + }, + /** Is among operator. */ + in { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + throw new UnsupportedOperationException(); + } + }, + /** Not is among operator. */ + ni { + @Override + public String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams) { + throw new UnsupportedOperationException(); + } + }; + + public abstract String toHql(String paramName, String propertyName, Object data, Map<String, Object> filterParams); + } + + + public static FilterPagerBeanBuilder newFilterPagerBeanBuilder(String operationGroup) { + FilterOperationGroup operationGroup1 = FilterOperationGroup.valueOf(operationGroup); + FilterPagerBeanBuilder builder = new FilterPagerBeanBuilder(operationGroup1); + return builder; + } + + public static class FilterPagerBeanBuilder { + + protected final FilterOperationGroup groupOp; + + protected final List<FilterRule> rules; + + public FilterPagerBeanBuilder(FilterOperationGroup groupOp) { + this.groupOp = groupOp; + rules = new LinkedList<FilterRule>(); + } + + public FilterPagerBeanBuilder addOperations(Collection<Map<String, String>> operations) { + for (Map<String, String> operation : operations) { + addRule(operation); + } + return this; + } + + public FilterPagerBeanBuilder addRule(Map<String, String> ruleMap) { + String op = ruleMap.get("op"); + String property = ruleMap.get("field"); + String value = ruleMap.get("data"); + FilterOperation operator = FilterOperation.valueOf(op); + return addRule(new FilterRule(operator, property, value)); + } + + public FilterPagerBeanBuilder addRule(FilterRule rule) { + rules.add(rule); + return this; + } + + public void flush(FilterPagerBean bean) { + bean.setGroupOp(groupOp); + bean.setRules(rules); + } + + + } +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaFilterPagerUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0