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

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