Author: tchemit Date: 2012-05-10 08:48:25 +0200 (Thu, 10 May 2012) New Revision: 2466 Url: http://nuiton.org/repositories/revision/topia/2466 Log: #2076: Deprecate some code Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java 2012-05-09 23:39:40 UTC (rev 2465) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/EntityFilter.java 2012-05-10 06:48:25 UTC (rev 2466) @@ -24,6 +24,8 @@ */ package org.nuiton.topia.framework; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; + import java.beans.PropertyChangeListener; /** @@ -31,7 +33,10 @@ * * @author fdesbois <fdesbois@codelutin.com> * @version $Id$ + * @deprecated since 3.0, prefer use the {@link TopiaFilterPagerUtil} (less + * logic, less pain...) will not be replaced. */ +@Deprecated public interface EntityFilter { String PROPERTY_START_INDEX = "startIndex"; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2012-05-09 23:39:40 UTC (rev 2465) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2012-05-10 06:48:25 UTC (rev 2466) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; import org.nuiton.topia.persistence.TopiaId; import java.beans.PropertyChangeListener; @@ -41,7 +42,10 @@ * * @author fdesbois * @since 2.0 + * @deprecated since 3.0, prefer use the {@link TopiaFilterPagerUtil} (less + * logic, less pain...) will not be replaced. */ +@Deprecated public class TopiaFilter implements EntityFilter { private static final Log log = LogFactory.getLog(TopiaFilter.class); @@ -69,7 +73,7 @@ Integer oldStartIndex = this.startIndex; this.startIndex = startIndex; propertyChangeSupport.firePropertyChange(PROPERTY_START_INDEX, - oldStartIndex, startIndex); + oldStartIndex, startIndex); } @Override @@ -82,7 +86,7 @@ String oldOrderBy = this.orderBy; this.orderBy = orderBy; propertyChangeSupport.firePropertyChange(PROPERTY_ORDER_BY, - oldOrderBy, orderBy); + oldOrderBy, orderBy); } @Override @@ -95,7 +99,7 @@ Integer oldEndIndex = this.endIndex; this.endIndex = endIndex; propertyChangeSupport.firePropertyChange(PROPERTY_END_INDEX, - oldEndIndex, endIndex); + oldEndIndex, endIndex); } @Override @@ -108,18 +112,18 @@ String oldReferenceId = this.referenceId; this.referenceId = referenceId; propertyChangeSupport.firePropertyChange(PROPERTY_REFERENCE_ID, - oldReferenceId, referenceId); + oldReferenceId, referenceId); } @Override public void setReference(Object entity) throws IllegalArgumentException { - if (! (entity instanceof TopiaEntity)) { + if (!(entity instanceof TopiaEntity)) { throw new IllegalArgumentException("Can't set reference of type '" + - entity.getClass().getName() + "' need a TopiaEntity"); + entity.getClass().getName() + "' need a TopiaEntity"); } - setReferenceId(((TopiaEntity)entity).getTopiaId()); + setReferenceId(((TopiaEntity) entity).getTopiaId()); } @Override @@ -137,7 +141,7 @@ String oldReferenceProperty = this.referenceProperty; this.referenceProperty = referenceProperty; propertyChangeSupport.firePropertyChange(PROPERTY_REFERENCE_PROPERTY, - oldReferenceProperty, referenceProperty); + oldReferenceProperty, referenceProperty); } @Override @@ -172,7 +176,7 @@ } catch (TopiaNotFoundException eee) { if (log.isWarnEnabled()) { log.warn("ReferenceId '" + referenceId + "' is not a" + - " compatible topiaId : " + eee.getMessage()); + " compatible topiaId : " + eee.getMessage()); } } } @@ -204,14 +208,14 @@ if (mandatory && !hasReference()) { throw new IllegalArgumentException("The filter reference" + - " of type '" + reference.getSimpleName() + "' is mandatory !"); + " of type '" + reference.getSimpleName() + "' is mandatory !"); } if (hasReference() && - !isClassReference(reference)) { + !isClassReference(reference)) { throw new IllegalArgumentException("Reference filtered need to be" + - " a '" + reference.getSimpleName() + "' (referenceId = " + - referenceId + ")"); + " a '" + reference.getSimpleName() + "' (referenceId = " + + referenceId + ")"); } } 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-05-09 23:39:40 UTC (rev 2465) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2012-05-10 06:48:25 UTC (rev 2466) @@ -66,7 +66,9 @@ * @author poussin <poussin@codelutin.com> * @version $Id$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.EntityHibernateMappingGenerator" + * @deprecated since 3.0, use now {@link EntityJPAMappingGenerator} instead, should not be replaced. */ +@Deprecated public class EntityHibernateMappingGenerator extends ObjectModelGenerator { /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2012-05-09 23:39:40 UTC (rev 2465) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2012-05-10 06:48:25 UTC (rev 2466) @@ -52,7 +52,9 @@ * @version $Id$ * @since 2.4 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.QueryHelperTransformer" + * @deprecated since 3.0, Will find a better solution to deal with queries in jpa, should not be replaced. */ +@Deprecated public class QueryHelperTransformer extends ObjectModelTransformerToJava { private static final Log log = LogFactory.getLog(QueryHelperTransformer.class);