Author: athimel Date: 2014-01-18 19:21:51 +0100 (Sat, 18 Jan 2014) New Revision: 2983 Url: http://nuiton.org/projects/topia/repository/revisions/2983 Log: fixes #552 Clean API (last org.nuiton.topia.persistence.* classes : *TopiaException, TopiaEntityEnum, TopiaQueryBuilder*, TopiaService, TopiaTransaction, ...) Remove all SVN keywords in Javadoc Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/AbstractExtraDAOEntityTopiaDao.java trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/beangen/RoueImpl.java trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1.java trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaApplicationContextCacheTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/EntityStateTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/ExportXMLVisitor.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/FakeService.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/TestService.java trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/QueryMissingOrderException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNoResultException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNonUniqueResultException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNotFoundException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaReplicationDestination.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaService.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransaction.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaVetoException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesVetoable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityVetoable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionVetoable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DAOHelperTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDTOTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaJavaValidator.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/package-info.java Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/AbstractExtraDAOEntityTopiaDao.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/AbstractExtraDAOEntityTopiaDao.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/AbstractExtraDAOEntityTopiaDao.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -29,7 +29,6 @@ * Created: 26 mai 2010 * * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ */ public class AbstractExtraDAOEntityTopiaDao<E extends ExtraDAOEntity> extends GeneratedExtraDAOEntityTopiaDao<E> { Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/beangen/RoueImpl.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/beangen/RoueImpl.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/beangen/RoueImpl.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -32,10 +32,6 @@ * Created: 14 janv. 2010 * * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ */ public class RoueImpl extends Roue { Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -29,7 +29,6 @@ * Created: 11 mai 2010 * * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ */ public interface Entity1 extends TopiaEntity { Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -27,7 +27,6 @@ * Created: 11 mai 2010 * * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ */ public class Entity1Impl extends Entity1Abstract { } Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaApplicationContextCacheTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaApplicationContextCacheTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaApplicationContextCacheTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -47,7 +47,6 @@ * Created: 8 mai 2010 * * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ */ public class TopiaApplicationContextCacheTest { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/EntityStateTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/EntityStateTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/EntityStateTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -34,10 +34,6 @@ * Created: 22 nov. 06 12:15:11 * * @author poussin <poussin@codelutin.com> - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ */ public class EntityStateTest { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -43,10 +43,6 @@ * Test pour les methodes de {@link TopiaUtil}. * * @author tchemit <chemit@codelutin.com> - * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ */ public class TopiaUtilTest { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -41,10 +41,6 @@ * TopiaTestCase. * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ public class TopiaTestCase { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -47,10 +47,6 @@ * Test de visitor. * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ public class EntityVisitorExportXmlTest { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/ExportXMLVisitor.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/ExportXMLVisitor.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/ExportXMLVisitor.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -24,7 +24,6 @@ package org.nuiton.topia.it.legacy.persistence; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; @@ -35,10 +34,6 @@ * Visitor pour export xml. * * @author chatellier - * @version $Revision$ - * <p/> - * Last update : $Date$ - * By : $Author$ */ @Ignore public class ExportXMLVisitor implements TopiaEntityVisitor { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -43,10 +43,6 @@ * Created: 18 févr. 2010 * * @author fdesbois - * @version $Revision$ - * <p/> - * Mise a jour: $Date$ - * par : $Author$ */ public class NaturalIdTest { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -29,10 +29,6 @@ * Created: 4 juin 2009 * * @author Florian Desbois <fdesbois@codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ */ package org.nuiton.topia.it.legacy.topiatest.deletetest; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/FakeService.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/FakeService.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/FakeService.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -21,6 +21,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ + package org.nuiton.topia.it.legacy.topiatest.service; import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; @@ -36,7 +37,6 @@ * Created: 10 mai 2010 * * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ */ public class FakeService implements TopiaService { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/TestService.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/TestService.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/TestService.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -35,7 +35,6 @@ * Created: 10 mai 2010 * * @author fdesbois <fdesbois@codelutin.com> - * @version $Id$ */ @Ignore public class TestService implements TopiaService { Modified: trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -44,12 +44,8 @@ /** * Test on {@link TopiaDao}. - * <p/> - * Last update : $Date$ - * By : $Author$ * * @author chatellier - * @version $Revision$ */ public class TopiaDaoTest { // Should not be located in topia-it module Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -24,24 +24,25 @@ * #L% */ +import java.util.Arrays; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; + import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; -import java.util.Arrays; -import java.util.Map; -import java.util.Set; - /** - * A builder to create syntactically correct hql and associated parameters given properties or after various constraint + * A builder to create syntactically correct HQL and associated parameters given properties or after various constraint * adds. + * <p/> + * It may be used in a Dao to ease dynamic construction of queries. * - * <p>It may be used in a Dao to ease dynamic construction of queries.</p> - * * @since 3.0 */ public class HqlAndParametersBuilder<E extends TopiaEntity> { @@ -108,8 +109,7 @@ } /** - * @param in true if property value must be in given collection, false if value - * must not be in given collection + * @param in true if property value must be in given collection, false if value must not be in given collection */ protected void addInOrNotIn(String property, Iterable<?> values, boolean in) { Preconditions.checkArgument(StringUtils.isNotEmpty(property)); @@ -231,7 +231,7 @@ public String getHql() { StringBuilder hqlStringBuilder = new StringBuilder(); hqlStringBuilder.append("from ").append(entityClass.getCanonicalName()).append(" ").append(alias); - if ( ! whereClauses.isEmpty()) { + if (!whereClauses.isEmpty()) { hqlStringBuilder.append(" where (").append(StringUtils.join(whereClauses, ") and (")).append(")"); } if (CollectionUtils.isNotEmpty(orderByArguments)) { @@ -241,14 +241,13 @@ return hql; } - /** Converts a (nested) property name to an HQL argument name. - * + /** + * Converts a (nested) property name to an HQL argument name. + * <p/> * For example getParameterName("yearlyDeclaration.survey.topiaId") → "yearlyDeclarationSurveyTopiaId" * - * @param propertyName the name of a property, can be a path to a - * nested property - * @return a string that can syntactically be used as an HQL parameter - * name, not prefixed by ':' + * @param propertyName the name of a property, can be a path to a nested property + * @return a string that can syntactically be used as an HQL parameter name, not prefixed by ':' */ protected String getParameterName(String propertyName) { Preconditions.checkArgument(StringUtils.isNotBlank(propertyName)); @@ -259,8 +258,7 @@ } /** - * Add a parameter in the parameters map searching with the suitable parameter name - * in order to prevent conflicts. + * Add a parameter in the parameters map searching with the suitable parameter name in order to prevent conflicts. * * @return the found key where the parameter has been added, suitable to use in the where clause */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/QueryMissingOrderException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/QueryMissingOrderException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/QueryMissingOrderException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -27,12 +27,12 @@ import java.util.Map; /** - * <p>If you get this exception, it means that you asked ToPIA to make an operation that needs a deterministic way to sort - * the result but you didn't defined such query.</p> + * If you get this exception, it means that you asked ToPIA to make an operation that needs a deterministic way to sort + * the result but you didn't defined such query. + * <p/> + * To fix you issue, you may use another API call (maybe user findAny instead of findFirst) or change your query by + * adding an order by clause. A quick and easy fix would be to just use "order by topiaId". * - * <p>To fix you issue, you may use another API call (maybe user findAny instead of findFirst) or change your query by - * adding an order by clause. A quick and easy fix would be to just use "order by topiaId".</p> - * * @since 3.0 */ public class QueryMissingOrderException extends TopiaQueryException { 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 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,44 +24,38 @@ * #L% */ -package org.nuiton.topia.persistence; - import java.io.Serializable; /** - * The contract to be realised by the generated enumeration in any DAOHelper. - * <p/> - * Example : for a model Test, we will have a - * <code>TestDOAHelper.TestEntityEnum</code> enumeration generated. - * <p/> - * The contract gives some informations about the classes for any entity dealed + * This contract represents a generated entity. It provides some information about the classes for any entity managed * by the dao helper. More precisely : + * <ul> + * <li>- contract class of the entity (this must be an interface class)</li> + * <li>- the implementation FQN class of an entity (at generation time, we might not have the implementation class)</li> + * <li>- the implementation class (will be looked up at runtime, in that way we make possible to used a different + * implementation at runtime.</li> + * <li>- a method to accept any TopiaEntity class for this entity description</li> + * </ul> * <p/> - * - 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) - * - the implementation class (will be looked up at runtime execution, in that - * way we make possible to used a different implementation at runtime. - * <p/> - * - a method to accept any TopiaEntity class for this entity description + * For each entity of the model, a realisation of this contract is generated in an enum named XxxEntityEnum (where + * Xxx is the name of your project). * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.2.0 */ public interface TopiaEntityEnum extends Serializable { /** - * This is a convinient method, as entity enum offers this - * method from {@link Enum#name()}. + * This is a convenient method, as entity enum offers this method from {@link Enum#name()}. * * @return the name of the underlying entity type. * @since 2.6.12 */ String name(); - - /** @return the contract class of the entity */ + /** + * @return the contract class of the entity + */ Class<? extends TopiaEntity> getContract(); /** @@ -69,12 +65,13 @@ */ 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. + * @return the array of property names involved in the natural key of the entity. */ String[] getNaturalIds(); @@ -91,8 +88,7 @@ boolean isUseNaturalIds(); /** - * @return {@code true} if entity use some not-null properties, - * {@code false} otherwise. + * @return {@code true} if entity use some not-null properties, {@code false} otherwise. * @since 2.6.9 */ boolean isUseNotNulls(); @@ -100,31 +96,28 @@ /** * Change the implementation class of the entity. * <p/> - * Note : this method should reset all states of the objet - * (implementation class, operators,...). + * Note : this method should reset all states of the object (implementation class, operators,...). * - * @param implementationFQN the new fully qualifed name of the new - * implementation class of the entity. + * @param implementationFQN the new fully qualified name of the new implementation class of the entity. */ void setImplementationFQN(String implementationFQN); /** * Test if a given type of entity is matching the contract of this entity. * <p/> - * 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. + * 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. * <p/> * Example : A -> B * <pre> - * EntityEnum.A.accept(Class<A>) -> true - * EntityEnum.A.accept(Class<B>) -> false - * EntityEnum.B.accept(Class<B>) -> true - * EntityEnum.B.accept(Class<A>) -> false + * XxxEntityEnum.A.accept(Class<A>) -> true + * XxxEntityEnum.A.accept(Class<B>) -> false + * XxxEntityEnum.B.accept(Class<B>) -> true + * XxxEntityEnum.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. + * @return {@code true} if given type is dealed directly by this entity, {@code false} otherwise. */ boolean accept(Class<? extends TopiaEntity> klass); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,15 +24,14 @@ * #L% */ -package org.nuiton.topia.persistence; - /** - * Main exception for any Topia error + * Main exception for any ToPIA exception * <p/> * Created: 23 déc. 2005 23:03:36 + * <p/> + * Since version 3.0, this exception is now a RuntimeException has it represents only technical issues. * * @author poussin <poussin@codelutin.com> - * @version $Id$ */ public class TopiaException extends RuntimeException { @@ -52,8 +53,7 @@ } /** - * Constructor for a wrapped TopiaException over a {@code cause} - * with a {@code message}. + * Constructor for a wrapped TopiaException over a {@code cause} with a {@code message}. * * @param message exception message * @param cause exception cause Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNoResultException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNoResultException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNoResultException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -27,16 +27,15 @@ import java.util.Map; /** - * Exception raised when a query returned no result while at least one - * result was expected. + * Exception raised when a query returned no result while at least one result was expected. * * @since 3.0 */ public class TopiaNoResultException extends TopiaQueryException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 6521219494000872219L; public TopiaNoResultException(String hql, Map<String, Object> hqlParameters) { - super("given query doesn't returns any result (at least one expected)", hql, hqlParameters); + super("Given query doesn't returns any result (at least one expected)", hql, hqlParameters); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNonUniqueResultException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNonUniqueResultException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNonUniqueResultException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -27,17 +27,16 @@ import java.util.Map; /** - * Exception raised when a query returns more than one result while it was - * expected to return only one (or no result). + * Exception raised when a query returns more than one result while it was expected to return only one (or no result). * * @since 3.0 */ public class TopiaNonUniqueResultException extends TopiaQueryException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 8057839164405947600L; public TopiaNonUniqueResultException(String hql, Map<String, Object> hqlParameters) { - super("given query returns more than one result", hql, hqlParameters); + super("Given query returns more than one result", hql, hqlParameters); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNotFoundException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNotFoundException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNotFoundException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,19 +24,15 @@ * #L% */ -package org.nuiton.topia.persistence; - /** - * Exception thrown if one of the entry from the configuration is missing at runtime - * + * Exception thrown if one of the expected configuration entries is missing at runtime + * <p/> * Created: 23 déc. 2005 23:04:28 * * @author poussin <poussin@codelutin.com> - * @version $Id$ */ public class TopiaNotFoundException extends TopiaException { - /** Version UID */ private static final long serialVersionUID = -8206486077608923797L; /** @@ -53,11 +51,10 @@ } /** - * Constructor for a wrapped TopiaNotFoundException over a {@code cause} - * with a {@code message}. + * Constructor for a wrapped TopiaNotFoundException over a {@code cause} with a {@code message}. * * @param message exception message - * @param cause exception cause + * @param cause exception cause */ public TopiaNotFoundException(String message, Throwable cause) { super(message, cause); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -24,6 +24,14 @@ * #L% */ -public interface TopiaQueryBuilderAddCriteriaOrRunQueryStep<E extends TopiaEntity> extends TopiaQueryBuilderAddCriteriaStep<E>, TopiaQueryBuilderRunQueryStep<E> { +/** + * Additional contract that aggregate both {@link org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaStep} and + * {@link org.nuiton.topia.persistence.TopiaQueryBuilderRunQueryStep} contracts + * + * @author bleny + * @since 3.0 + */ +public interface TopiaQueryBuilderAddCriteriaOrRunQueryStep<E extends TopiaEntity> + extends TopiaQueryBuilderAddCriteriaStep<E>, TopiaQueryBuilderRunQueryStep<E> { } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -29,8 +29,7 @@ /** * Represents a step when building a query to add a constraint. * - * The builder implements the fluent interface DP, so you can add multiple - * constraints by chaining calls. + * The builder implements the fluent interface DP, so you can add multiple constraints by chaining calls. * * @author bleny * @since 3.0 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -24,23 +24,22 @@ * #L% */ -import com.google.common.base.Optional; +import java.util.List; + import org.nuiton.topia.persistence.pager.TopiaPagerBean; -import java.util.List; +import com.google.common.base.Optional; /** - * This interface represents different common operations that - * a user may do after a query is defined (using the + * This interface represents different common operations that a user may do after a query is defined (using the * {@link org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaStep}) + * <p/> + * There are different methods according to the supposed existence or uniqueness of the result. Also some methods may be + * used only if order is defined in query. + * <p/> + * Some methods return an {@link Optional}, but since it's not yet available in JDK, we use Guava's. If you don't want + * your project to require Guava dependency, we provide equivalent method named XXXOrNull() for the same purpose. * - * There are different methods according to the supposed existence or uniqueness - * of the result. Also some methods may be used only if order is defined in query. - * - * Some methods return an {@link Optional}, but since it's not yet available in JDK, - * we use Guava's. If you don't want your project to require Guava dependency, we - * provide equivalent method named XXXOrNull() for the same purpose. - * * @since 3.0 */ public interface TopiaQueryBuilderRunQueryStep<E extends TopiaEntity> { @@ -68,41 +67,41 @@ * Get the first element of the non-empty result set. * * @return the first value from the set of result, - * according to given order. Returned value - * can't be null + * according to given order. Returned value + * can't be null * @throws QueryMissingOrderException if you the query - * misses an order clause + * misses an order clause */ E findFirst() throws QueryMissingOrderException, TopiaNoResultException; /** * Get the first element of the result set or null if * query result was empty. - * + * <p/> * This method duplicates {@link #tryFindFirst()} * but allows you to prevent using Guava in you project. * * @return the first value from the set of result, - * according to given order, or null of result - * set for given query was empty + * according to given order, or null of result + * set for given query was empty * @throws QueryMissingOrderException if you the query - * misses an order clause + * misses an order clause */ E findFirstOrNull() throws QueryMissingOrderException; /** * Get the first element of the result set. - * + * <p/> * This method duplicates {@link #tryFindFirst()} * but allows you to prevent using Guava in you project. - * + * <p/> * If the call must return a result, prefer {@link #findFirst()} * * @return the first value from the set of result, - * according to given order. It's an optional - * because the query may return no result. + * according to given order. It's an optional + * because the query may return no result. * @throws QueryMissingOrderException if you the query - * misses an order clause + * misses an order clause */ Optional<E> tryFindFirst() throws QueryMissingOrderException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -27,21 +27,18 @@ import java.util.Map; /** - * Exception raised when an error occur in the context of a - * particular query. Catching this exception class allow you + * Exception raised when an error occur in the context of a particular query. Catching this exception class allow you * to get the buggy request and its parameters. + * <p/> + * When catching such an exception you may ease development by logging all the provided information given by + * {@link #getHql()} and {@link #getHqlParameters()} but it's considered dangerous since parameters can contain sensible + * data (such as passwords) that should not be printed anywhere. * - * When cathing such an exception you may ease development by - * logging all the provided information given by {@link #getHql()} - * and {@link #getHqlParameters()} but it's considered dangerous - * since parameters can contain sensible data (such as passwords) - * that should not be printed anywhere. - * * @since 3.0 */ public class TopiaQueryException extends TopiaException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 4374615882154083376L; protected String hql; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaReplicationDestination.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaReplicationDestination.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaReplicationDestination.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -24,20 +24,19 @@ * #L% */ -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.support.TopiaReplicationSupport; - /** * Represent the destination of a replication process. The source is - * {@link TopiaReplicationSupport} + * {@link org.nuiton.topia.persistence.support.TopiaReplicationSupport} + * + * @since 3.0 */ public interface TopiaReplicationDestination { /** * Must replicate given entity in current database * + * @param entity the remote entity to replicate * @since 3.0 - * @param entity */ void replicate(TopiaEntity entity); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaService.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaService.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaService.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,33 +24,19 @@ * #L% */ -/* * - * TopiaService.java - * - * Created: 8 oct. 06 17:15:52 - * - * @author poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package org.nuiton.topia.persistence; - import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; /** - * Used to implement a service for Topia. You have to provide a static property - * called SERVICE_NAME that identify the service : + * Used to implement a service for Topia. You have to provide a static property called SERVICE_NAME that identify the + * service: * <p/> * <li>public static final String SERVICE_NAME = "monservice"; * <p/> - * The value of this attribute need to be returned when using - * {@link #getServiceName()} method. + * The value of this attribute need to be returned when using {@link #getServiceName()} method. + * <p/> + * Created: 8 oct. 06 17:15:52 * * @author poussin <poussin@codelutin.com> - * @version $Id$ */ public interface TopiaService { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransaction.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransaction.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransaction.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -25,7 +25,7 @@ */ /** - * This contract provides methods to manipulate transaction + * This contract represents a transaction and provides methods to manipulate it. * * @author Arnaud Thimel : thimel@codelutin.com * @since 3.0 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaVetoException.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaVetoException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaVetoException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,15 +24,12 @@ * #L% */ -package org.nuiton.topia.persistence; - /** * Exception thrown when something went wrong during event firing * <p/> * Created: 5 janv. 2006 00:47:51 * * @author poussin <poussin@codelutin.com> - * @version $Id$ */ public class TopiaVetoException extends TopiaException { @@ -52,8 +51,7 @@ } /** - * Constructor for a wrapped TopiaVetoException over a {@code cause} - * with a {@code message}. + * Constructor for a wrapped TopiaVetoException over a {@code cause} with a {@code message}. * * @param message exception message * @param cause exception cause Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,20 +24,6 @@ * #L% */ -/* * - * EntityState.java - * - * Created: 22 nov. 06 12:10:57 - * - * @author poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ - -package org.nuiton.topia.persistence.event; - /** * Used to know the state of entity during transaction. * Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextEvent.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextEvent.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.event; - import java.util.EventObject; import org.nuiton.topia.persistence.TopiaPersistenceContext; @@ -33,7 +33,6 @@ * Used for Migration service. * * @author chatellier <chatellier@codelutin.com> - * @version $Id$ */ public class TopiaContextEvent extends EventObject { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesEvent.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesEvent.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.event; - import org.nuiton.topia.persistence.support.TopiaJpaSupport; import org.nuiton.topia.persistence.TopiaEntity; @@ -34,7 +34,6 @@ * TODO-fdesbois-20100507 : Need javadoc. * * @author jruchaud <jruchaud@codelutin.com> - * @version $Id$ */ public class TopiaEntitiesEvent<E extends TopiaEntity> extends EventObject { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesVetoable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesVetoable.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesVetoable.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.event; - import org.nuiton.topia.persistence.TopiaEntity; import java.util.EventListener; @@ -33,7 +33,6 @@ * Permet de lancer des événements liés au récupération des données * * @author jruchaud <jruchaud@codelutin.com> - * @version $Id$ */ public interface TopiaEntitiesVetoable extends EventListener { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityEvent.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityEvent.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.event; - import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaEntity; @@ -33,7 +33,6 @@ * TODO-fdesbois-20100507 : Need javadoc. * * @author jruchaud <jruchaud@codelutin.com> - * @version $Id$ */ public class TopiaEntityEvent extends EventObject { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityListener.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityListener.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.event; - import java.util.EventListener; /** @@ -31,7 +31,6 @@ * * @author poussin <poussin@codelutin.com> * @author tchemit <tchemit@codelutin.com> - * @version $Id$ */ public interface TopiaEntityListener extends EventListener { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityVetoable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityVetoable.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityVetoable.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -7,23 +9,21 @@ * Copyright (C) 2004 - 2014 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 + * 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 + * + * 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.event; - import java.util.EventListener; /** @@ -31,7 +31,6 @@ * * @author jruchaud <jruchaud@codelutin.com> * @author tchemit <tchemit@codelutin.com> - * @version $Id$ */ public interface TopiaEntityVetoable extends EventListener { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.event; - import org.apache.commons.collections.map.IdentityMap; import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaEntity; @@ -33,11 +33,10 @@ import java.util.Set; /** - * Event fires for {@link TopiaTransactionListener}. + * Event fires for {@link org.nuiton.topia.persistence.event.TopiaTransactionListener}. * * @author poussin <poussin@codelutin.com> - * @version $Id$ - * @see TopiaTransactionListener + * @see org.nuiton.topia.persistence.event.TopiaTransactionListener */ public class TopiaTransactionEvent extends EventObject { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionVetoable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionVetoable.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionVetoable.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.event; - import java.util.EventListener; /** @@ -31,7 +31,6 @@ * * @author jruchaud <jruchaud@codelutin.com> * @author tchemit <tchemit@codelutin.com> - * @version $Id$ */ public interface TopiaTransactionVetoable extends EventListener { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.internal.support; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.internal.support; - import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -63,7 +63,6 @@ * gestion, les fires, ... * * @author jruchaud <jruchaud@codelutin.com> - * @version $Id$ */ public class TopiaFiresSupport implements TopiaListenableSupport { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -38,7 +38,6 @@ * Abstract migration callback. * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.5 */ public abstract class AbstractTopiaMigrationCallback<PersistenceContext extends TopiaPersistenceContext> { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -31,9 +31,6 @@ * @author Chevallereau Benjamin * @author Eon Sébastien * @author Trève Vincent - * @version $Revision$ - * - * Last update : $Date$ */ public class MigrationServiceException extends Exception { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -46,7 +46,6 @@ * {@link TopiaMigrationCallbackByMethod} begins to be messy. * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.5 */ public abstract class TopiaMigrationCallbackByClass<PersistenceContext extends TopiaPersistenceContext& TopiaHibernateSupport & TopiaSqlSupport> extends AbstractTopiaMigrationCallback<PersistenceContext> { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -48,7 +48,6 @@ * {@link TopiaMigrationCallbackByMethod} begins to be messy. * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.9.11 */ public abstract class TopiaMigrationCallbackByClassNG<PersistenceContext extends TopiaPersistenceContext> extends AbstractTopiaMigrationCallback<PersistenceContext> { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -42,7 +42,6 @@ * Replace deprecated implementation {@code TopiaMigrationCallBack}. * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.5 */ public abstract class TopiaMigrationCallbackByMethod<PersistenceContext extends TopiaPersistenceContext& TopiaHibernateSupport & TopiaSqlSupport> extends AbstractTopiaMigrationCallback<PersistenceContext> { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -66,7 +66,6 @@ * FIXME Finir cette documentation * * @author tchemit - * @version $Id$ * @since 2.3.4 */ public class TopiaMigrationEngine implements TopiaMigrationService { Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -34,7 +34,6 @@ * @author Eon Sébastien * @author Trève Vincent * @author tchemit <chemit@codelutin.com> - * @version $Id$ */ public interface TopiaMigrationService extends TopiaService { Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -60,7 +60,6 @@ * Created: 07 jun. 09 17:14:22 * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.2.0 */ public abstract class AbstractTopiaReplicationServiceTest extends Assert { Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -49,7 +49,6 @@ * A template to generate a helper for {@link TopiaEntityBinder}. * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.templates.BinderHelperTransformer" * @since 2.3.1 */ Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DAOHelperTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DAOHelperTransformer.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DAOHelperTransformer.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -57,7 +57,6 @@ * Created: 13 nov. 2009 09:05:17 * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.templates.DAOHelperTransformer" * @deprecated Will be removed before 3.0 Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -47,7 +47,6 @@ * Created: 20 déc. 2009 * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.templates.DTOTransformer" */ Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDTOTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDTOTransformer.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDTOTransformer.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -36,7 +36,6 @@ import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.topia.templates.TopiaGeneratorUtil; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -54,7 +53,6 @@ * Created: 14 déc. 2009 * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @since 2.3.0 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.templates.EntityDTOTransformer" * @deprecated since 3.0, will not be replaced Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaJavaValidator.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaJavaValidator.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaJavaValidator.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -31,9 +31,7 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.validator.ObjectModelValidator; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; /** @@ -43,7 +41,6 @@ * - les duplication d'attibuts * * @author chatellier <chatellier@codelutin.com> - * @version $Id$ */ public class TopiaJavaValidator extends ObjectModelValidator { Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -40,7 +40,6 @@ * Created: 20 déc. 2009 * * @author tchemit <chemit@codelutin.com> - * @version $Id$ * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.templates.TopiaMetaTransformer" * @since 2.3.0 */ Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/package-info.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/package-info.java 2014-01-17 22:38:39 UTC (rev 2982) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) @@ -113,6 +113,5 @@ * lien entre deux entités.</p> * * @author poussin <poussin@codelutin.com> - * @version $Id$ */ package org.nuiton.topia.templates;