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

r1991 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org June 2, 2010

June 2, 2010

Author: fdesbois Date: 2010-06-03 01:28:25 +0200 (Thu, 03 Jun 2010) New Revision: 1991 Url: http://nuiton.org/repositories/revision/topia/1991 Log: missing case for empty select 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-06-02 21:36:15 UTC (rev 1990) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-06-02 23:28:25 UTC (rev 1991) @@ -620,15 +620,19 @@ */ public TopiaQuery addFetch(String... properties) { + // Check mainAlias, necessary to use join fetch boolean needAlias = false; if (StringUtils.isEmpty(mainAlias)) { mainAlias = RandomStringUtils.randomAlphabetic(4); - from.append(' ').append(mainAlias); - if (select == null) { - setSelect(mainAlias); - } + from.append(' ').append(mainAlias); needAlias = true; } + + // Init select for single result + if (select == null) { + setSelect(mainAlias); + } + for (String current : properties) { // Add missing alias if needed String property = needAlias ?

1 0

r1990 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org June 2, 2010

June 2, 2010

Author: fdesbois Date: 2010-06-02 23:36:15 +0200 (Wed, 02 Jun 2010) New Revision: 1990 Url: http://nuiton.org/repositories/revision/topia/1990 Log: Add fetch managment using addFetch method 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-06-02 15:07:56 UTC (rev 1989) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-06-02 21:36:15 UTC (rev 1990) @@ -484,9 +484,9 @@ String alias, boolean fetch) { String sep = separator; if (fetch) { - sep = new StringBuilder(separator).append("FETCH ").toString(); + sep = new StringBuilder(separator).append(" FETCH").toString(); } - return addFrom(separator, property, alias); + return addFrom(sep, property, alias); } /** @@ -612,17 +612,49 @@ return this; } + /** + * TODO-fdesbois-2010-06-02 : javadoc + * + * @param properties + * @return + */ public TopiaQuery addFetch(String... properties) { + + boolean needAlias = false; if (StringUtils.isEmpty(mainAlias)) { mainAlias = RandomStringUtils.randomAlphabetic(4); from.append(' ').append(mainAlias); if (select == null) { setSelect(mainAlias); } + needAlias = true; } - for (String property : properties) { - String propertyWithAlias = getProperty(mainAlias, property); - addLeftJoin(propertyWithAlias, null, true); + for (String current : properties) { + // Add missing alias if needed + String property = needAlias ? + getProperty(mainAlias, current) : current; + + // Split property on . + String[] parts = property.split("\\."); + + // First alias need to be a property in query + String alias = parts[0]; + + for (int i = 1; i < parts.length; i++) { + // Construct property with current alias + String propertyToJoin = getProperty(alias, parts[i]); + + // If next occurence exists create a new alias + if ((i + 1) < parts.length) { + alias = RandomStringUtils.randomAlphabetic(4); + } else { + // loop will stop, last alias is null + alias = null; + } + + // Add the property in left join with fetch to true + addLeftJoin(propertyToJoin, alias, true); + } } return this; }

1 0

r1989 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org June 2, 2010

June 2, 2010

Author: fdesbois Date: 2010-06-02 17:07:56 +0200 (Wed, 02 Jun 2010) New Revision: 1989 Url: http://nuiton.org/repositories/revision/topia/1989 Log: Add fetch managment (not fully tested) 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-06-02 12:45:32 UTC (rev 1988) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-06-02 15:07:56 UTC (rev 1989) @@ -411,8 +411,8 @@ * @param str the element to add * @return the TopiaQuery * @see #addFrom(Class, String) - * @see #addJoin(String, String) - * @see #addLeftJoin(String, String) + * @see #addJoin(String, String, boolean) + * @see #addLeftJoin(String, String, boolean) * @deprecated since 2.4 use correct addFrom or addJoin or addLeftJoin */ @Deprecated @@ -445,37 +445,50 @@ /** * Add a inner join {@code property} to the query with {@code alias}. * The join is done in From statement as : FROM Contact C JOIN C.boat B. The - * added part is 'JOIN C.boat B' using addJoin("C.boat", "B"). The order + * added part is 'JOIN C.boat B' using addJoin("C.boat", "B", false). The order * of calling {@link #addFrom(Class, String)} or this method is very important. * The first element in the FROM is always the main entity of the query. * * @param property Property name to use as a Join * @param alias Alias of the property in the query + * @param fetch Add FETCH keyword to load the property in result (avoid + * lazy initialization) * @return the TopiaQuery * @since 2.4 */ - public TopiaQuery addJoin(String property, String alias) { - return addFrom(FROM_SEPARATOR_JOIN, property, alias); + public TopiaQuery addJoin(String property, String alias, boolean fetch) { + return addFromJoin(FROM_SEPARATOR_JOIN, property, alias, fetch); } /** * Add a left join {@code property} to the query with {@code alias}. * The join is done in From statement as : FROM Contact C LEFT JOIN C.boat B. - * The added part is 'LEFT JOIN C.boat B' using addJoin("C.boat", "B"). + * The added part is 'LEFT JOIN C.boat B' using addJoin("C.boat", "B", false). * The order of calling {@link #addFrom(Class, String)} or this method is * very important. The first element in the FROM is always the main entity * of the query. * * @param property Property name to use as a Join * @param alias Alias of the property in the query + * @param fetch Add FETCH keyword to load the property in result (avoid + * lazy initialization) * @return the TopiaQuery * @since 2.4 */ - public TopiaQuery addLeftJoin(String property, String alias) { - return addFrom(FROM_SEPARATOR_LEFT_JOIN, property, alias); + public TopiaQuery addLeftJoin(String property, String alias, boolean fetch) { + return addFromJoin(FROM_SEPARATOR_LEFT_JOIN, property, alias, fetch); } + protected TopiaQuery addFromJoin(String separator, String property, + String alias, boolean fetch) { + String sep = separator; + if (fetch) { + sep = new StringBuilder(separator).append("FETCH ").toString(); + } + return addFrom(separator, property, alias); + } + /** * Add an other entity type to the from in the query. * @@ -599,6 +612,21 @@ return this; } + public TopiaQuery addFetch(String... properties) { + if (StringUtils.isEmpty(mainAlias)) { + mainAlias = RandomStringUtils.randomAlphabetic(4); + from.append(' ').append(mainAlias); + if (select == null) { + setSelect(mainAlias); + } + } + for (String property : properties) { + String propertyWithAlias = getProperty(mainAlias, property); + addLeftJoin(propertyWithAlias, null, true); + } + return this; + } + protected List<String> getPropertiesToLoad() { if (propertiesToLoad == null) { propertiesToLoad = new ArrayList<String>(); @@ -816,7 +844,10 @@ public TopiaQuery addNotNull(String paramName) { StringBuilder result = new StringBuilder(paramName).append(' ').append(Op.NOT_NULL); - return addWhere(result.toString()); + parentheses = false; + addWhere(result.toString()); + parentheses = true; + return this; } /**

1 0

r1988 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org June 2, 2010

June 2, 2010

Author: fdesbois Date: 2010-06-02 14:45:32 +0200 (Wed, 02 Jun 2010) New Revision: 1988 Url: http://nuiton.org/repositories/revision/topia/1988 Log: Add join support in TopiaQuery 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-06-02 10:30:27 UTC (rev 1987) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-06-02 12:45:32 UTC (rev 1988) @@ -234,10 +234,12 @@ private static final Log log = LogFactory.getLog(TopiaQuery.class); - public static final String FROM_SEPARATOR_DEFAULT = ", "; + public static final String FROM_SEPARATOR_DEFAULT = ","; - public static final String FROM_SEPARATOR_JOIN = " JOIN "; + public static final String FROM_SEPARATOR_JOIN = "JOIN"; + public static final String FROM_SEPARATOR_LEFT_JOIN = "LEFT JOIN"; + /** Params for HQL query * */ protected List<Object> params; @@ -408,40 +410,80 @@ * * @param str the element to add * @return the TopiaQuery - * @see #addFrom(String, String) - * @deprecated since 2.4 use {@link #addFrom(String, String)} + * @see #addFrom(Class, String) + * @see #addJoin(String, String) + * @see #addLeftJoin(String, String) + * @deprecated since 2.4 use correct addFrom or addJoin or addLeftJoin */ @Deprecated public TopiaQuery addFrom(String str) { - return addFrom(str, null); + return addFrom(FROM_SEPARATOR_DEFAULT, 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 property the property to add * @param separator The separator to use before adding the element (if null * 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 = FROM_SEPARATOR_DEFAULT; + protected TopiaQuery addFrom(String separator, String property, String alias) { + if (!separator.equals(FROM_SEPARATOR_DEFAULT)) { + from.append(' '); } - from.append(separator).append(str); + from.append(separator).append(' ').append(property); + + if (alias != null) { + from.append(' ').append(alias); + } return this; } /** + * Add a inner join {@code property} to the query with {@code alias}. + * The join is done in From statement as : FROM Contact C JOIN C.boat B. The + * added part is 'JOIN C.boat B' using addJoin("C.boat", "B"). The order + * of calling {@link #addFrom(Class, String)} or this method is very important. + * The first element in the FROM is always the main entity of the query. + * + * @param property Property name to use as a Join + * @param alias Alias of the property in the query + * @return the TopiaQuery + * @since 2.4 + */ + public TopiaQuery addJoin(String property, String alias) { + return addFrom(FROM_SEPARATOR_JOIN, property, alias); + } + + + /** + * Add a left join {@code property} to the query with {@code alias}. + * The join is done in From statement as : FROM Contact C LEFT JOIN C.boat B. + * The added part is 'LEFT JOIN C.boat B' using addJoin("C.boat", "B"). + * The order of calling {@link #addFrom(Class, String)} or this method is + * very important. The first element in the FROM is always the main entity + * of the query. + * + * @param property Property name to use as a Join + * @param alias Alias of the property in the query + * @return the TopiaQuery + * @since 2.4 + */ + public TopiaQuery addLeftJoin(String property, String alias) { + return addFrom(FROM_SEPARATOR_LEFT_JOIN, property, alias); + } + + /** * Add an other entity type to the from in the query. * * @param entityClass different from the mainEntity * @return the TopiaQuery */ public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass) { - return addFrom(entityClass.getName(), null); + return addFrom(entityClass, null); } /** @@ -453,7 +495,7 @@ */ public TopiaQuery addFrom(Class<? extends TopiaEntity> entityClass, String alias) { - return addFrom(entityClass.getName() + " " + alias, null); + return addFrom(FROM_SEPARATOR_DEFAULT, entityClass.getName(), alias); } /**

1 0

r1987 - trunk
by tchemit＠users.nuiton.org June 2, 2010

June 2, 2010

Author: tchemit Date: 2010-06-02 12:30:27 +0200 (Wed, 02 Jun 2010) New Revision: 1987 Url: http://nuiton.org/repositories/revision/topia/1987 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 15:16:53 UTC (rev 1986) +++ trunk/pom.xml 2010-06-02 10:30:27 UTC (rev 1987) @@ -23,9 +23,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>topia</artifactId>

1 0

r1986 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org June 1, 2010

June 1, 2010

Author: echatellier Date: 2010-06-01 17:16:53 +0200 (Tue, 01 Jun 2010) New Revision: 1986 Url: http://nuiton.org/repositories/revision/topia/1986 Log: Add initialisation getters for transient objects Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2010-05-31 15:54:09 UTC (rev 1985) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2010-06-01 15:16:53 UTC (rev 1986) @@ -61,6 +61,9 @@ */ public abstract class TopiaEntityAbstract implements TopiaEntity { + /** serialVersionUID. */ + private static final long serialVersionUID = -7458577454878852241L; + /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(TopiaEntityAbstract.class); @@ -72,18 +75,62 @@ transient protected TopiaContext topiaContext; - transient protected VetoableChangeSupport readVetoables = - new VetoableChangeSupport(this); + transient protected VetoableChangeSupport readVetoables; - transient protected PropertyChangeSupport readListeners = - new PropertyChangeSupport(this); + transient protected PropertyChangeSupport readListeners; - transient protected VetoableChangeSupport writeVetoables = - new VetoableChangeSupport(this); + transient protected VetoableChangeSupport writeVetoables; - transient protected PropertyChangeSupport writeListeners = - new PropertyChangeSupport(this); + transient protected PropertyChangeSupport writeListeners; + /** + * Initialize {@link #readVetoables} at first use or after deserialisation. + * + * @return readVetoables + */ + protected VetoableChangeSupport getReadVetoableChangeSupport() { + if (readVetoables == null) { + readVetoables = new VetoableChangeSupport(this); + } + return readVetoables; + } + + /** + * Initialize {@link #readListeners} at first use or after deserialisation. + * + * @return readListeners + */ + protected PropertyChangeSupport getReadPropertyChangeSupport() { + if (readListeners == null) { + readListeners = new PropertyChangeSupport(this); + } + return readListeners; + } + + /** + * Initialize {@link #writeVetoables} at first use or after deserialisation. + * + * @return writeVetoables + */ + protected VetoableChangeSupport getWriteVetoableChangeSupport() { + if (writeVetoables == null) { + writeVetoables = new VetoableChangeSupport(this); + } + return writeVetoables; + } + + /** + * Initialize {@link #writeListeners} at first use or after deserialisation. + * + * @return writeListeners + */ + protected PropertyChangeSupport getWritePropertyChangeSupport() { + if (writeListeners == null) { + writeListeners = new PropertyChangeSupport(this); + } + return writeListeners; + } + @Override public String getTopiaId() { return topiaId; @@ -196,7 +243,7 @@ TopiaContextImplementor contextImplementor = (TopiaContextImplementor) getTopiaContext(); if (contextImplementor != null) { - contextImplementor.getFiresSupport().fireOnPreRead(readVetoables, + contextImplementor.getFiresSupport().fireOnPreRead(getReadVetoableChangeSupport(), this, propertyName, value); } } @@ -205,7 +252,7 @@ TopiaContextImplementor contextImplementor = (TopiaContextImplementor) getTopiaContext(); if (contextImplementor != null) { - contextImplementor.getFiresSupport().fireOnPostRead(readListeners, + contextImplementor.getFiresSupport().fireOnPostRead(getReadPropertyChangeSupport(), this, propertyName, value); } } @@ -215,7 +262,7 @@ TopiaContextImplementor contextImplementor = (TopiaContextImplementor) getTopiaContext(); if (contextImplementor != null) { - contextImplementor.getFiresSupport().fireOnPostRead(readListeners, + contextImplementor.getFiresSupport().fireOnPostRead(getReadPropertyChangeSupport(), this, propertyName, index, value); } } @@ -225,7 +272,7 @@ TopiaContextImplementor contextImplementor = (TopiaContextImplementor) getTopiaContext(); if (contextImplementor != null) { - contextImplementor.getFiresSupport().fireOnPreWrite(writeVetoables, + contextImplementor.getFiresSupport().fireOnPreWrite(getWriteVetoableChangeSupport(), this, propertyName, oldValue, newValue); } } @@ -236,7 +283,7 @@ (TopiaContextImplementor) getTopiaContext(); if (contextImplementor != null) { contextImplementor.getFiresSupport().fireOnPostWrite( - writeListeners, this, propertyName, oldValue, newValue); + getWritePropertyChangeSupport(), this, propertyName, oldValue, newValue); } } @@ -246,7 +293,7 @@ (TopiaContextImplementor) getTopiaContext(); if (contextImplementor != null) { contextImplementor.getFiresSupport().fireOnPostWrite( - writeListeners, this, propertyName, index, oldValue, + getWritePropertyChangeSupport(), this, propertyName, index, oldValue, newValue); } } @@ -254,89 +301,89 @@ @Override public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - writeListeners.addPropertyChangeListener(propertyName, listener); + getWritePropertyChangeSupport().addPropertyChangeListener(propertyName, listener); } @Override public void addPropertyChangeListener(PropertyChangeListener listener) { - writeListeners.addPropertyChangeListener(listener); + getWritePropertyChangeSupport().addPropertyChangeListener(listener); } @Override public void addVetoableChangeListener(String propertyName, VetoableChangeListener vetoable) { - writeVetoables.addVetoableChangeListener(propertyName, vetoable); + getWriteVetoableChangeSupport().addVetoableChangeListener(propertyName, vetoable); } @Override public void addVetoableChangeListener(VetoableChangeListener vetoable) { - writeVetoables.addVetoableChangeListener(vetoable); + getWriteVetoableChangeSupport().addVetoableChangeListener(vetoable); } @Override public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - writeListeners.removePropertyChangeListener(propertyName, listener); + getWritePropertyChangeSupport().removePropertyChangeListener(propertyName, listener); } @Override public void removePropertyChangeListener(PropertyChangeListener listener) { - writeListeners.removePropertyChangeListener(listener); + getWritePropertyChangeSupport().removePropertyChangeListener(listener); } @Override public void removeVetoableChangeListener(String propertyName, VetoableChangeListener vetoable) { - writeVetoables.removeVetoableChangeListener(propertyName, vetoable); + getWriteVetoableChangeSupport().removeVetoableChangeListener(propertyName, vetoable); } @Override public void removeVetoableChangeListener(VetoableChangeListener vetoable) { - writeVetoables.removeVetoableChangeListener(vetoable); + getWriteVetoableChangeSupport().removeVetoableChangeListener(vetoable); } @Override public void addPropertyListener(String propertyName, PropertyChangeListener listener) { - readListeners.addPropertyChangeListener(propertyName, listener); + getReadPropertyChangeSupport().addPropertyChangeListener(propertyName, listener); } @Override public void addPropertyListener(PropertyChangeListener listener) { - readListeners.addPropertyChangeListener(listener); + getReadPropertyChangeSupport().addPropertyChangeListener(listener); } @Override public void addVetoableListener(String propertyName, VetoableChangeListener vetoable) { - readVetoables.addVetoableChangeListener(propertyName, vetoable); + getReadVetoableChangeSupport().addVetoableChangeListener(propertyName, vetoable); } @Override public void addVetoableListener(VetoableChangeListener vetoable) { - readVetoables.addVetoableChangeListener(vetoable); + getReadVetoableChangeSupport().addVetoableChangeListener(vetoable); } @Override public void removePropertyListener(String propertyName, PropertyChangeListener listener) { - readListeners.removePropertyChangeListener(propertyName, listener); + getReadPropertyChangeSupport().removePropertyChangeListener(propertyName, listener); } @Override public void removePropertyListener(PropertyChangeListener listener) { - readListeners.removePropertyChangeListener(listener); + getReadPropertyChangeSupport().removePropertyChangeListener(listener); } @Override public void removeVetoableListener(String propertyName, VetoableChangeListener vetoable) { - readVetoables.removeVetoableChangeListener(propertyName, vetoable); + getReadVetoableChangeSupport().removeVetoableChangeListener(propertyName, vetoable); } @Override public void removeVetoableListener(VetoableChangeListener vetoable) { - readVetoables.removeVetoableChangeListener(vetoable); + getReadVetoableChangeSupport().removeVetoableChangeListener(vetoable); } } //TopiaEntityAbstract

1 0

r1985 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by fdesbois＠users.nuiton.org May 31, 2010

May 31, 2010

Author: fdesbois Date: 2010-05-31 17:54:09 +0200 (Mon, 31 May 2010) New Revision: 1985 Url: http://nuiton.org/repositories/revision/topia/1985 Log: Missing getContext method to use DAOLegacy Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 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-30 14:56:55 UTC (rev 1984) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-31 15:54:09 UTC (rev 1985) @@ -506,7 +506,7 @@ @Override public E findByQuery(TopiaQuery query) throws TopiaException { - E result = query.executeToEntity(context, getEntityClass()); + E result = query.executeToEntity(getContext(), getEntityClass()); return result; }

1 0

r1984 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework main/java/org/nuiton/topia/generator main/java/org/nuiton/topia/persistence test/xmi
by fdesbois＠users.nuiton.org May 30, 2010

May 30, 2010

Author: fdesbois Date: 2010-05-30 16:56:55 +0200 (Sun, 30 May 2010) New Revision: 1984 Url: http://nuiton.org/repositories/revision/topia/1984 Log: - Add LegacyDAO to compare memory charge between HQL query and Criteria (old usage for findByProperties) : 'model.tagvalue.useLegacyDAO=true' in model properties - Change log level in TopiaQuery - Manage null case for findByTopiaId in TopiaDAOImpl Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.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 trunk/topia-persistence/src/test/xmi/topiatest.properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-28 13:15:53 UTC (rev 1983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-30 14:56:55 UTC (rev 1984) @@ -634,8 +634,8 @@ */ public TopiaQuery addWhere(String paramName, Op operator, Object paramValue) { StringBuilder result = new StringBuilder(paramName).append(' '); - if (log.isDebugEnabled()) { - log.debug("paramValue = " + paramValue); + if (log.isTraceEnabled()) { + log.trace("paramValue = " + paramValue); } if (paramValue == null) { result.append(Op.NULL); @@ -700,8 +700,8 @@ } // Only one paramValue if (length == 1) { - if (log.isDebugEnabled()) { - log.debug("Only one value " + Arrays.toString(paramValue)); + if (log.isTraceEnabled()) { + log.trace("Only one value " + Arrays.toString(paramValue)); } return addWhere(paramName, Op.EQ, paramValue[0]); } 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-28 13:15:53 UTC (rev 1983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-05-30 14:56:55 UTC (rev 1984) @@ -44,6 +44,7 @@ import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaDAOImpl; +import org.nuiton.topia.persistence.TopiaDAOLegacy; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; @@ -81,6 +82,8 @@ Map<ObjectModelClass, Set<ObjectModelClass>> usages; + protected boolean extendLegacyDAO; + /** * Map of extra operations for DAO. The key of the map is the qualified * name of the entity relative to the DAO. @@ -92,6 +95,7 @@ public void transformFromModel(ObjectModel model) { usages = TopiaGeneratorUtil.searchDirectUsages(model); + extendLegacyDAO = Boolean.valueOf(model.getTagValue("useLegacyDAO")); } @Override @@ -156,8 +160,11 @@ } } if (extendClass.length() == 0) { - extendClass = TopiaDAOImpl.class.getName() + "<E>"; - + if (extendLegacyDAO) { + extendClass = TopiaDAOLegacy.class.getName() + "<E>"; + } else { + extendClass = TopiaDAOImpl.class.getName() + "<E>"; + } } if (log.isDebugEnabled()) { log.debug("super class = " + extendClass); 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-28 13:15:53 UTC (rev 1983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2010-05-30 14:56:55 UTC (rev 1984) @@ -259,7 +259,15 @@ */ TopiaQuery createQuery(String entityAlias); - E findByTopiaId(String k) throws TopiaException; + /** + * Find an entity corresponding to the {@code id}. If the {@code id} is + * null, nothing will be search. + * + * @param id topiaId of the entity to found + * @return the entity found or null if not + * @throws TopiaException for Topia errors on query + */ + E findByTopiaId(String id) throws TopiaException; E findByProperty(String propertyName, Object value) throws 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-28 13:15:53 UTC (rev 1983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2010-05-30 14:56:55 UTC (rev 1984) @@ -469,8 +469,12 @@ @Override public E findByTopiaId(String id) throws TopiaException { - TopiaQuery query = createQuery().addEquals(TopiaEntity.TOPIA_ID, id); - E result = findByQuery(query); + // Nothing to do if id is null, the result will still be null. + E result = null; + if (id != null) { + TopiaQuery query = createQuery().addEquals(TopiaEntity.TOPIA_ID, id); + result = findByQuery(query); + } return result; } @@ -515,7 +519,7 @@ @Override public List<String> findAllIds() throws TopiaException { TopiaQuery query = createQuery().setSelect(TopiaEntity.TOPIA_ID); - List<String> results = context.findByQuery(query); + List<String> results = getContext().findByQuery(query); return results; } @@ -547,7 +551,7 @@ @Override public List<E> findAllByQuery(TopiaQuery query) throws TopiaException { - List<E> results = query.executeToEntityList(context, getEntityClass()); + List<E> results = query.executeToEntityList(getContext(), getEntityClass()); return results; } @@ -555,7 +559,7 @@ public Map<String, E> findAllMappedByQuery(TopiaQuery query) throws TopiaException { Map<String, E> results = - query.executeToEntityMap(context, getEntityClass()); + query.executeToEntityMap(getContext(), getEntityClass()); return results; } @@ -564,7 +568,7 @@ Class<K> keyClass) throws TopiaException { Map<K, E> results = - query.executeToEntityMap(context, getEntityClass(), + query.executeToEntityMap(getContext(), getEntityClass(), keyName, keyClass); return results; } @@ -621,7 +625,7 @@ @Override public int countByQuery(TopiaQuery query) throws TopiaException { - int result = query.executeCount(context); + int result = query.executeCount(getContext()); return result; } Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2010-05-30 14:56:55 UTC (rev 1984) @@ -0,0 +1,871 @@ +/* *##% + * ToPIA :: Persistence + * Copyright (C) 2004 - 2009 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>. + * ##%*/ + +/* * + * TopiaDAOAbstract.java + * + * Created: 31 déc. 2005 13:10:34 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ + +package org.nuiton.topia.persistence; + +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.security.Permission; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Criteria; +import org.hibernate.FlushMode; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.event.TopiaEntityListener; +import org.nuiton.topia.event.TopiaEntityVetoable; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.hibernate.HibernateException; +import org.hibernate.Session; +import org.hibernate.criterion.Criterion; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; +import org.hibernate.metadata.ClassMetadata; +import org.nuiton.topia.framework.TopiaQuery; + +/** + * Cette classe permet d'avoir un ensemble de méthode implantée de façon + * standard et plus spécifiquement pour Hibernate. + * + * Certains accès à Hibernate sont tout de même fait ici, car on a pris le + * choix de se baser entièrement sur hibernate pour la persistence, et il + * est ainsi possible d'accèder au meta information hibernate sur les classes + * lorque l'on en a besoin. + * + * @param <E> le type de l'entite + * @author poussin + * + */ + +public class TopiaDAOLegacy<E extends TopiaEntity> extends TopiaDAOImpl<E> { // TopiaDAOImpl + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static Log log = LogFactory.getLog(TopiaDAOImpl.class); + + protected Class<E> entityClass = null; + + protected TopiaContextImplementor context = null; + + @Override + public Class<E> getEntityClass() { + throw new UnsupportedOperationException( + "This method must be overided in generated DAO"); + } + + /** + * Retourne l'id de l'entity + * @param e l'entity + * @return l'id de l'entity ou null si pas trouvé + * @throws TopiaException Si une erreur survient durant la recherche + */ + protected Serializable getId(E e) throws TopiaException { + ClassMetadata meta = getClassMetadata(); + String idPropName = meta.getIdentifierPropertyName(); + + Serializable result; + try { + result = (Serializable) PropertyUtils.getSimpleProperty(e, + idPropName); + } catch (IllegalAccessException eee) { + throw new TopiaException("Impossible de récuperer l'identifiant " + + idPropName + " de l'entite: " + e); + } catch (InvocationTargetException eee) { + throw new TopiaException("Impossible de récuperer l'identifiant " + + idPropName + " de l'entite: " + e); + } catch (NoSuchMethodException eee) { + throw new TopiaException("Impossible de récuperer l'identifiant " + + idPropName + " de l'entite: " + e); + } + return result; + } + + /** + * Retourne l'id de l'entity representer comme une map + * @param map l'entity en representation map + * @return l'id de l'entity ou null si pas trouvé + * @throws TopiaException Si une erreur survient durant la recherche + */ + protected Serializable getId(Map map) throws TopiaException { + try { + ClassMetadata meta = getClassMetadata(); + String idPropName = meta.getIdentifierPropertyName(); + + Serializable id = (Serializable) map.get(idPropName); + return id; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + /** + * When TopiaContextImpl create the TopiaDAOHibernate, it must call this method just + * after + * + * @param entityClass + */ + public void init(TopiaContextImplementor context, Class<E> entityClass) + throws TopiaException { + log.debug("init dao for " + entityClass.getName()); + this.context = context; + this.entityClass = entityClass; + } + + @Override + public TopiaContextImplementor getContext() { + return context; + } + + @SuppressWarnings("unchecked") + protected E instanciateNew() throws TopiaException { + E result = null; + if (log.isDebugEnabled()) { + log.debug("entityClass = " + entityClass); + } + String classname = entityClass.getName(); + try { + // on commence par essayer d'instancier le Impl + result = ((Class<E>) Class.forName(classname + "Impl")) + .newInstance(); + if (log.isDebugEnabled()) { + log.debug("Utilisation de la classe " + classname + "Impl" + + " pour " + classname); + } + } catch (InstantiationException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible d'instancier " + classname + "Impl"); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } catch (IllegalAccessException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible d'instancier " + classname + "Impl"); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } catch (ClassNotFoundException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible de trouver la classe " + classname + + "Impl"); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } + + if (result == null) { + // le impl n'est pas trouvé on essai avec la classe elle meme + try { + result = entityClass.newInstance(); + if (log.isDebugEnabled()) { + log.debug("Utilisation de la classe " + classname + + " pour " + classname); + } + } catch (InstantiationException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible d'instancier " + classname); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } catch (IllegalAccessException eee) { + if (log.isWarnEnabled()) { + log.warn("Impossible d'instancier " + classname); + } + if (log.isDebugEnabled()) { + log.debug("StackTrace", eee); + } + } + } + + if (result == null) { + throw new TopiaException( + "Impossible de trouver ou d'instancier la classe " + + classname); + } + + return result; + } + + /** + * Callback method when context was commit. + * By default, the method does nothing + * @throws org.nuiton.topia.TopiaException + */ + @Override + public void commitTransaction() throws TopiaException { + } + + /** + * Callback method when context was rollback. + * By default, the method does nothing + * @throws org.nuiton.topia.TopiaException + */ + @Override + public void rollbackTransaction() throws TopiaException { + } + + @Override + public E create(Object... properties) throws TopiaException { + Map<String, Object> map = new HashMap<String, Object>(); + Object propertyName = null; + Object value = null; + try { + for (int i = 0; i < properties.length;) { + propertyName = properties[i++]; + value = properties[i++]; + map.put((String) propertyName, value); + } + } catch (ArrayIndexOutOfBoundsException eee) { + throw new IllegalArgumentException("Wrong number of argument " + + properties.length + + ", you must have even number. Last property name read: " + + propertyName); + } catch (ClassCastException eee) { + throw new IllegalArgumentException( + "Wrong argument type, wait property name as String and have " + + propertyName.getClass().getName()); + } + + E result = create(map); + return result; + } + + @Override + public E findByPrimaryKey(Map<String, Object> keys) + throws TopiaException { + try { + // we used hibernate meta information for all persistence type + // it's more easy than create different for all persistence + ClassMetadata meta = getClassMetadata(); + if (meta.hasNaturalIdentifier()) { + E result = findByProperties(keys); + return result; + } + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + throw new TopiaException("La classe " + entityClass.getName() + + " n'a pas de cle primaire naturelle"); + + } + + /** + * private method because this is hibernate specific method and we don't + * want expose it + * + * @return the meta-data of the entity + * @throws TopiaException if any pb + */ + private ClassMetadata getClassMetadata() throws TopiaException { + ClassMetadata meta = getContext().getHibernateFactory() + .getClassMetadata(entityClass); + if (meta == null) { + meta = getContext().getHibernateFactory().getClassMetadata( + entityClass.getName() + "Impl"); + } + return meta; + } + + @Override + public E findByPrimaryKey(Object... k) throws TopiaException { + // TODO pour une meilleur gestion des problemes a la compilation + // mettre un premier couple (propName, value) en argument ca evitera + // de pouvoir appeler cette methode sans argument + try { + ClassMetadata meta = getClassMetadata(); + if (meta.hasNaturalIdentifier()) { + int[] ikeys = meta.getNaturalIdentifierProperties(); + String[] pnames = meta.getPropertyNames(); + + Map<String, Object> keys = new HashMap<String, Object>(); + for (int ikey : ikeys) { + keys.put(pnames[ikey], k[ikey]); + } + + E result = findByProperties(keys); + return result; + } + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + throw new TopiaException("La classe " + entityClass.getName() + + " n'a pas de cle primaire naturelle"); + + } + + @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); + } + } + E result = findByProperties(properties); + return result; + } + + @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); + } + } + List<E> result = findAllByProperties(properties); + return result; + } + + @Override + public E findContainsProperties(Map<String, Collection<?>> properties) + throws TopiaException { + List<E> results = findAllContainsProperties(properties); + E result = null; + if (results.size() > 0) { + result = results.get(0); + } + return result; + } + + @Override + public E findContainsProperties(String propertyName, + Collection values, Object... others) throws TopiaException { + Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); + properties.put(propertyName, values); + Object name = null; + for (int i = 0; i < others.length;) { + try { + name = others[i++]; + values = (Collection) others[i++]; + properties.put((String) name, values); + } 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); + } + } + E result = findContainsProperties(properties); + return result; + } + + /** + * Find all entities with a specific rule : + * When the entity have a Collection type property, you want to find all entites where some values are + * contained in the collection type property. + * Example entity parameter : private Collection<Date> historicalDates; + * You want some dates to be contained in historicalDates. + * Collection<Date> myDates... + * myDates.add(date1) ... + * Map<String, Collection> properties = new HashMap<String,Collection>(); + * properties.put("historicalDates",myDates); + * findAllContainsProperties(properties); + * @param properties + * @return the list of entities corresponding to the request + * @throws org.nuiton.topia.TopiaException if any pb + */ + @Override + public List<E> findAllContainsProperties(Map<String, Collection<?>> properties) throws TopiaException { + List<E> all = findAll(); + List<E> result = new ArrayList<E>(); + for (E e : all) { + boolean ok = true; + try { + for (Entry<String, Collection<?>> kv : properties.entrySet()) { + Collection entityValues = (Collection) PropertyUtils + .getProperty(e, kv.getKey()); + Collection values = kv.getValue(); + if (!entityValues.containsAll(values)) { + ok = false; + break; + } + } + } 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); + } + } + return result; + } + + @Override + public List<E> findAllContainsProperties(String propertyName, + Collection values, Object... others) throws TopiaException { + Map<String, Collection<?>> properties = new HashMap<String, Collection<?>>(); + properties.put(propertyName, values); + Object name = null; + for (int i = 0; i < others.length;) { + try { + name = others[i++]; + values = (Collection) others[i++]; + properties.put((String) name, values); + } 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); + } + } + List<E> result = findAllContainsProperties(properties); + return result; + } + + @Override + public List<E> findAllByProperty(String propertyName, Object value) + throws TopiaException { + Map<String, Object> properties = new HashMap<String, Object>(); + properties.put(propertyName, value); + List<E> result = findAllByProperties(properties); + return result; + } + + @Override + public E findByProperty(String propertyName, Object value) + throws TopiaException { + Map<String, Object> properties = new HashMap<String, Object>(); + properties.put(propertyName, value); + E result = findByProperties(properties); + return result; + } + + @Deprecated + private Criterion computeCriterions(Object... values) { + if (values == null) { + return null; + } + Criterion criterion = null; + for (Object value : values) { + criterion = or(criterion, computeCriterion(value)); + } + return criterion; + } + + @Deprecated + private Criterion computeCriterion(Object value) { + Criterion criterion = null; + SearchFields fields = entityClass.getAnnotation(SearchFields.class); + String textValue = "%" + value + "%"; + //textFields + String[] textFields = fields.txtFields(); + for (String propName : textFields) { + criterion = or(criterion, Restrictions.like(propName, textValue)); + } + //numFields + boolean isNumber = (value instanceof Number); + if (value instanceof String) { + try { + Double.parseDouble((String) value); + isNumber = true; + } catch (NumberFormatException nfe) { + isNumber = false; + } + + } + if (isNumber) { + String[] numFields = fields.numFields(); + for (String propName : numFields) { + criterion = or(criterion, Restrictions.sqlRestriction(propName + + " like '" + textValue + "'")); + } + } + //boolFields + boolean isBoolean = (value instanceof Boolean); + if (value instanceof String) { + isBoolean |= ("true".equalsIgnoreCase((String) value) || "false" + .equalsIgnoreCase((String) value)); + } + if (isBoolean) { + Boolean booleanValue; + if (value instanceof String) { + booleanValue = Boolean.valueOf((String) value); + } else { + booleanValue = (Boolean) value; + } + String[] boolFields = fields.numFields(); + for (String propName : boolFields) { + criterion = or(criterion, Restrictions.eq(propName, + booleanValue)); + } + } + //timeFields + String[] timeFields = fields.dateFields(); + for (String propName : timeFields) { + criterion = or(criterion, Restrictions.sqlRestriction(propName + + " like '" + textValue + "'")); + } + return criterion; + } + + @Deprecated + private Criterion or(Criterion crit1, Criterion crit2) { + if (crit1 == null) { + return crit2; + } + if (crit2 == null) { + return crit1; + } + return Restrictions.or(crit1, crit2); + } + + @Override + public void addTopiaEntityListener(TopiaEntityListener listener) { + getContext().addTopiaEntityListener(entityClass,listener); + } + + @Override + public void addTopiaEntityVetoable(TopiaEntityVetoable vetoable) { + getContext().addTopiaEntityVetoable(entityClass,vetoable); + } + + @Override + public void removeTopiaEntityListener(TopiaEntityListener listener) { + getContext().removeTopiaEntityListener(entityClass, listener); + } + + @Override + public void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable) { + getContext().removeTopiaEntityVetoable(entityClass, vetoable); + } + + /** + * Cette methode appelle fireVetoableCreate et fireOnCreated + * Si vous la surchargé, faites attention a appeler le super + * ou a appeler vous aussi ces deux methodes. + */ + @Override + public E create(Map<String, Object> properties) throws TopiaException { + E result = instanciateNew(); + + // TODO reflechir s'il ne faudrait pas creer l'id avant l'event precedent + // reflechir toujours dans un context on les E pourrait ne pas + // etre des TopiaEntity + if (result instanceof TopiaEntity) { + String topiaId = TopiaId.create(entityClass); + TopiaEntityAbstract entity = (TopiaEntityAbstract) result; + entity.setTopiaId(topiaId); + entity.setTopiaContext(getContext()); + } + try { + for (Map.Entry<String, Object> e : properties.entrySet()) { + String propertyName = e.getKey(); + Object value = e.getValue(); + PropertyUtils.setProperty(result, propertyName, value); + } + } catch (IllegalAccessException eee) { + throw new IllegalArgumentException( + "Can't put properties on new Object", eee); + } catch (InvocationTargetException eee) { + throw new IllegalArgumentException( + "Can't put properties on new Object", eee); + } catch (NoSuchMethodException eee) { + throw new IllegalArgumentException( + "Can't put properties on new Object", eee); + } + result.postCreate(); + + // on fait un save maintenant, car puisqu'on a creer l'entity au + // travers du DAO, on s'attend a l'avoir a disposition tout de + // suite pour les requetes sans avoir a faire un update dessus + getSession().save(result); + getContext().getFiresSupport().warnOnCreateEntity(result); + return result; + } + + @Override + public E update(E e) throws TopiaException { + try { + getSession().saveOrUpdate(e); + getContext().getFiresSupport().warnOnUpdateEntity(e); + return e; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + @Override + public void delete(E e) throws TopiaException { + try { + getSession().delete(e); + getContext().getFiresSupport().warnOnDeleteEntity(e); + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + @Override + public E findByTopiaId(String k) throws TopiaException { + return query(Restrictions.idEq(k)); + } + + @Override + public List<E> findAll() throws TopiaException { + try { + Criteria criteria = createCriteria(FlushMode.AUTO); + List<E> result = (List<E>) criteria.list(); + result = getContext().getFiresSupport().fireEntitiesLoad(context, + result); + return result; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + @Override + public List<String> findAllIds() throws TopiaException { + List<String> find = context.find("select src.topiaId from " + entityClass.getSimpleName() + "Impl src"); + return find; + } + + + + @Override + public List<E> findAllWithOrder(String... propertyNames) + throws TopiaException { + try { + Criteria criteria = createCriteria(FlushMode.AUTO); + for (String propertyName : propertyNames) { + criteria.addOrder(Order.asc(propertyName)); + } + List<E> result = (List<E>) criteria.list(); + result = getContext().getFiresSupport().fireEntitiesLoad(context, + result); + return result; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + /** + * Count number of existing entities using {@link org.nuiton.topia.framework.TopiaQuery#executeCount(org.nuiton.topia.TopiaContext) } + * FIXME-FD20091224 change type to int like in 2.2.2 version + * + * @return a long for the number of entities in database + */ + @Override + public long size() throws TopiaException { + //int result = findAll().size(); +// List result = this.getContext().find("SELECT count(*) FROM " + getEntityClass().getName() + "Impl"); +// return (Long)result.get(0); + return new TopiaQuery(getEntityClass()).executeCount(context); + } + + @Override + public E findByProperties(Map<String, Object> properties) + throws TopiaException { + return query(Restrictions.allEq(properties)); + } + + @Override + public List<E> findAllByProperties(Map<String, Object> properties) + throws TopiaException { + return queryAll(Restrictions.allEq(properties)); + } + + private List<E> queryAll(Criterion criterion) throws TopiaException { + try { + Criteria criteria = createCriteria(FlushMode.AUTO); + criteria.add(criterion); + List<E> result = (List<E>) criteria.list(); + result = getContext().getFiresSupport().fireEntitiesLoad(context, + result); + return result; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + private E query(Criterion criterion) throws TopiaException { + try { + Criteria criteria = createCriteria(FlushMode.AUTO); + criteria.add(criterion); + criteria.setMaxResults(1); + List<E> result = (List<E>) criteria.list(); + int sizeBefore = (result != null ? result.size() : 0); + result = getContext().getFiresSupport().fireEntitiesLoad(context, + result); + int sizeAfter = (result != null ? result.size() : 0); + if (sizeAfter < sizeBefore) { + if (log.isDebugEnabled()) { + log.debug((sizeBefore - sizeAfter) + + " element(s) removed. Filter entity: " + + entityClass.getName() + " - criterion: " + + criterion); + } + } + if (result != null && result.size() > 0) { + E elem = result.get(0); + return elem; + } + return null; + } catch (HibernateException eee) { + throw new TopiaException(eee); + } + } + + //FIXME : Commenté car impossible de trouver le bon Criterion + // ATTENTION ancienne methode du TopiaDAOAbstract deja presente dans le fichier + + // /* (non-Javadoc) + // * @see org.nuiton.topia.persistence.TopiaDAO#findContainsProperties(java.util.Map) + // */ + // public E findContainsProperties(Map<String, Collection> properties) throws TopiaException { + // try { + // Criteria criteria = createCriteria(FlushMode.AUTO); + // for (Entry<String, Collection> entry : properties.entrySet()) { + // for (Object value : entry.getValue()) { + // criteria.add(Restrictions.eq(entry.getKey(), value)); + // } + // } + // criteria.setMaxResults(1); + // List<E> results = (List<E>)criteria.list(); + // if (results.size() > 0) { + // return (E)results.get(0); + // } else { + // return null; + // } + // } catch (HibernateException eee) { + // throw new TopiaException(eee); + // } + // } + // + // /* (non-Javadoc) + // * @see org.nuiton.topia.persistence.TopiaDAO#findAllContainsProperties(java.util.Map) + // */ + // public List<E> findAllContainsProperties(Map<String, Collection> properties) throws TopiaException { + // try { + // Criteria criteria = createCriteria(FlushMode.AUTO); + // for (Entry<String, Collection> entry : properties.entrySet()) { + // for (Object value : entry.getValue()) { + // criteria.add(Restrictions.eq(entry.getKey(), value)); + // } + // } + // List<E> result = (List<E>)criteria.list(); + // return result; + // } catch (HibernateException eee) { + // throw new TopiaException(eee); + // } + // } + + /** + * Renvoie un Criteria créé avec l'entityClass + * @param mode le FlushMode du Criteria + * @return le Criteria nouvellement créé + * @throws org.nuiton.topia.TopiaException if any pb + */ + private Criteria createCriteria(FlushMode mode) throws TopiaException { + Criteria criteria = getSession().createCriteria(entityClass); + criteria.setFlushMode(mode); + return criteria; + } + + /** + * Renvoie la Session contenue dans le contexte + * @return hibernate session + * @throws org.nuiton.topia.TopiaException if any pb + */ + private Session getSession() throws TopiaException { + return getContext().getHibernate(); + } + + @Override + public List<Permission> getRequestPermission(String topiaId, int actions) + throws TopiaException { + return null; + } + + +} //TopiaDAOImpl Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-05-28 13:15:53 UTC (rev 1983) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2010-05-30 14:56:55 UTC (rev 1984) @@ -1,5 +1,6 @@ model.tagvalue.i18n=topia.test.common. model.tagvalue.generateOperatorForDAOHelper=true +model.tagvalue.useLegacyDAO=true #org.nuiton.topiatest.Company.class.tagvalue.naturalIdMutable=false #org.nuiton.topiatest.Company.attribute.siret.tagvalue.naturalId=true

1 0

r1983 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by fdesbois＠users.nuiton.org May 28, 2010

May 28, 2010

Author: fdesbois Date: 2010-05-28 15:15:53 +0200 (Fri, 28 May 2010) New Revision: 1983 Url: http://nuiton.org/repositories/revision/topia/1983 Log: Change log level for loading properties 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-28 11:37:47 UTC (rev 1982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2010-05-28 13:15:53 UTC (rev 1983) @@ -1400,8 +1400,8 @@ throws TopiaException { try { Object res = PropertyUtils.getProperty(entity, property); - if (log.isTraceEnabled()) { - log.trace("load property '" + property + "' for '" + + if (log.isDebugEnabled()) { + log.debug("load property '" + property + "' for '" + entity.getClass().getSimpleName() + "'"); } if (res != null && Collection.class.isAssignableFrom(res.getClass())) {

1 0

r1982 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org May 28, 2010

May 28, 2010

Author: tchemit Date: 2010-05-28 13:37:47 +0200 (Fri, 28 May 2010) New Revision: 1982 Url: http://nuiton.org/repositories/revision/topia/1982 Log: add registerTopiaBinder which returns actually inserted binder Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2010-05-28 08:35:24 UTC (rev 1981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2010-05-28 11:37:47 UTC (rev 1982) @@ -119,6 +119,21 @@ ); op = addOperation(resultClass, + "registerTopiaBinder", + "<E extends TopiaEntity> TopiaEntityBinder<E>", + ObjectModelModifier.PUBLIC, + ObjectModelModifier.STATIC); + addParameter(op, "Class<E>", "entityClass"); + addParameter(op, "BinderBuilder", "builder"); + addParameter(op, "String", "contextName"); + setOperationBody(op, "" +/*{ + BinderProvider.registerBinder(builder, TopiaEntityBinder.class, contextName); + return getTopiaBinder(entityClass, contextName); + }*/ + ); + + op = addOperation(resultClass, "copy", "<E extends TopiaEntity> void", ObjectModelModifier.PUBLIC,

1 0