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

Build failed in Jenkins: topia #1
by admin+ci-nuiton.org＠codelutin.com Jan. 26, 2014

Jan. 26, 2014

See <http://ci-ng.nuiton.org/jenkins/job/topia/1/> ------------------------------------------ [...truncated 342 lines...] A topia-templates/src/main/java/org/nuiton A topia-templates/src/main/java/org/nuiton/topia A topia-templates/src/main/java/org/nuiton/topia/templates AU topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/EntityDTOTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/TopiaMetaTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/PersistenceContextTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/TopiaRelationValidator.java AU topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java AU topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java AU topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java AU topia-templates/src/main/java/org/nuiton/topia/templates/package-info.java AU topia-templates/src/main/java/org/nuiton/topia/templates/EntityEnumTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/TopiaJavaValidator.java AU topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/DAOHelperTransformer.java AU topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java AU topia-templates/src/main/java/org/nuiton/topia/templates/ApplicationContextTransformer.java A topia-templates/src/main/resources A topia-templates/src/main/resources/META-INF A topia-templates/src/main/resources/META-INF/services AU topia-templates/src/main/resources/META-INF/services/org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider AU topia-templates/pom.xml AU topia-templates/README.txt AU pom.xml AU README.txt A topia-persistence AU topia-persistence/LICENSE.txt AU topia-persistence/changelog.txt A topia-persistence/src A topia-persistence/src/test A topia-persistence/src/test/java A topia-persistence/src/test/java/org A topia-persistence/src/test/java/org/nuiton A topia-persistence/src/test/java/org/nuiton/topia A topia-persistence/src/test/java/org/nuiton/topia/persistence AU topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java AU topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java A topia-persistence/src/test/resources A topia-persistence/src/license AU topia-persistence/src/license/THIRD-PARTY.properties A topia-persistence/src/main A topia-persistence/src/main/java A topia-persistence/src/main/java/org A topia-persistence/src/main/java/org/nuiton A topia-persistence/src/main/java/org/nuiton/topia AU topia-persistence/src/main/java/org/nuiton/topia/package-info.java A topia-persistence/src/main/java/org/nuiton/topia/persistence AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContext.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaReplicationDestination.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/QueryMissingOrderException.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/pager AU topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleGroupOperator.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBeanBuilder.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRuleOperator.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/FilterRule.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceHelper.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransaction.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDaoSupplier.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaException.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/internal AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/LegacyTopiaIdFactory.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaApplicationContext.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaPersistenceContext.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaHibernateSessionRegistry.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/HibernateProvider.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaFiresSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/HibernateTopiaReplicationSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/HibernateTopiaJpaSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/HibernateTopiaSqlSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaServiceSupportImpl.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata AU topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaStep.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/event AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityListener.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextAdapter.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextEvent.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesEvent.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntitiesVetoable.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaSchemaListener.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionEvent.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionVetoable.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/package-info.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaTransactionListener.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityEvent.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityVetoable.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNotFoundException.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderAddCriteriaOrRunQueryStep.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryBuilderRunQueryStep.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaQueryException.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy AU topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceContext.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNoResultException.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaVetoException.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityVisitor.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaNonUniqueResultException.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/support AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlWork.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaReplicationSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaJpaSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaServiceSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaHibernateSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaListenableSupport.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaService.java A topia-persistence/src/main/java/org/nuiton/topia/persistence/util AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaH2Util.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java AU topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java A topia-persistence/src/main/resources A topia-persistence/src/main/resources/META-INF A topia-persistence/src/main/resources/META-INF/cache A topia-persistence/src/main/resources/META-INF/cache/argouml.org A topia-persistence/src/main/resources/META-INF/cache/argouml.org/profiles A topia-persistence/src/main/resources/META-INF/cache/argouml.org/profiles/um… AU topia-persistence/src/main/resources/META-INF/cache/argouml.org/profiles/um… AU topia-persistence/src/main/resources/META-INF/cache/argouml.org/profiles/um… AU topia-persistence/pom.xml AU topia-persistence/README.txt U . At revision 2990 Parsing POMs ERROR: Failed to parse POMs org.apache.maven.project.ProjectBuildingException: Some problems were encountered while processing the POMs: [FATAL] Non-resolvable parent POM: Could not find artifact org.nuiton:mavenpom4redmineAndCentral:pom:4.6-SNAPSHOT and 'parent.relativePath' points at wrong local POM @ line 29, column 11 at org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:364) at hudson.maven.MavenEmbedder.buildProjects(MavenEmbedder.java:361) at hudson.maven.MavenEmbedder.readProjects(MavenEmbedder.java:331) at hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1284) at hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1081) at hudson.FilePath.act(FilePath.java:914) at hudson.FilePath.act(FilePath.java:887) at hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.parsePoms(MavenModuleSetBuild.java:943) at hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:671) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:565) at hudson.model.Run.execute(Run.java:1670) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:519) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:231) [trunk] $ /opt/maven3/bin/mvn -f pom.xml -s /var/local/forge/data/nuiton.org/maven/settings.xml -e clean deploy -DperformRelease [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [ERROR] The build could not read 1 project -> [Help 1] org.apache.maven.project.ProjectBuildingException: Some problems were encountered while processing the POMs: [FATAL] Non-resolvable parent POM: Could not find artifact org.nuiton:mavenpom4redmineAndCentral:pom:4.6-SNAPSHOT and 'parent.relativePath' points at wrong local POM @ line 29, column 11 at org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:364) at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:637) at org.apache.maven.DefaultMaven.getProjectsForMavenReactor(DefaultMaven.java:586) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:229) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:555) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:214) at org.apache.maven.cli.MavenCli.main(MavenCli.java:158) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356) [ERROR] [ERROR] The project org.nuiton:topia:3.0-SNAPSHOT (<http://ci-ng.nuiton.org/jenkins/job/topia/ws/trunk/pom.xml)> has 1 error [ERROR] Non-resolvable parent POM: Could not find artifact org.nuiton:mavenpom4redmineAndCentral:pom:4.6-SNAPSHOT and 'parent.relativePath' points at wrong local POM @ line 29, column 11 -> [Help 2] org.apache.maven.model.resolution.UnresolvableModelException: Could not find artifact org.nuiton:mavenpom4redmineAndCentral:pom:4.6-SNAPSHOT at org.apache.maven.project.ProjectModelResolver.resolveModel(ProjectModelResolver.java:159) at org.apache.maven.model.building.DefaultModelBuilder.readParentExternally(DefaultModelBuilder.java:817) at org.apache.maven.model.building.DefaultModelBuilder.readParent(DefaultModelBuilder.java:669) at org.apache.maven.model.building.DefaultModelBuilder.build(DefaultModelBuilder.java:307) at org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:411) at org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:380) at org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:344) at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:637) at org.apache.maven.DefaultMaven.getProjectsForMavenReactor(DefaultMaven.java:586) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:229) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:555) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:214) at org.apache.maven.cli.MavenCli.main(MavenCli.java:158) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356) Caused by: org.eclipse.aether.resolution.ArtifactResolutionException: Could not find artifact org.nuiton:mavenpom4redmineAndCentral:pom:4.6-SNAPSHOT at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:459) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifacts(DefaultArtifactResolver.java:262) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifact(DefaultArtifactResolver.java:239) at org.eclipse.aether.internal.impl.DefaultRepositorySystem.resolveArtifact(DefaultRepositorySystem.java:295) at org.apache.maven.project.ProjectModelResolver.resolveModel(ProjectModelResolver.java:155) ... 21 more Caused by: org.eclipse.aether.transfer.ArtifactNotFoundException: Could not find artifact org.nuiton:mavenpom4redmineAndCentral:pom:4.6-SNAPSHOT at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:449) ... 25 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/ProjectBuildingException [ERROR] [Help 2] http://cwiki.apache.org/confluence/display/MAVEN/UnresolvableModelException Build step 'Invoke top-level Maven targets' marked build as failure

1 0

r2990 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org Jan. 22, 2014

Jan. 22, 2014

Author: tchemit Date: 2014-01-22 22:26:04 +0100 (Wed, 22 Jan 2014) New Revision: 2990 Url: http://nuiton.org/projects/topia/repository/revisions/2990 Log: fix message Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 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-22 16:26:53 UTC (rev 2989) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-01-22 21:26:04 UTC (rev 2990) @@ -301,7 +301,7 @@ Version version = getApplicationVersion(); - log.info(String.format("Starting Topia Migration Service - Application version \\: %1$s, Database version \\: %2$s", + log.info(String.format("Starting Topia Migration Service - Application version : %1$s, Database version : %2$s", version.getVersion(), dbVersion.getVersion()) );

1 0

r2989 - trunk/topia-templates/src/main/java/org/nuiton/topia/templates
by bleny＠users.nuiton.org Jan. 22, 2014

Jan. 22, 2014

Author: bleny Date: 2014-01-22 17:26:53 +0100 (Wed, 22 Jan 2014) New Revision: 2989 Url: http://nuiton.org/projects/topia/repository/revisions/2989 Log: refs #2776 check navigability when generating getComposite Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-01-22 14:00:13 UTC (rev 2988) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-01-22 16:26:53 UTC (rev 2989) @@ -1180,7 +1180,7 @@ if (attr.referenceClassifier() && TopiaGeneratorUtil.isEntity(attr.getClassifier())) { - if (attr.isComposite()) { + if (attr.isComposite() && attr.isNavigable()) { String attrName = attr.getName(); String getterName = getJavaBeanMethodName("get", attrName); if (TopiaGeneratorUtil.isNMultiplicity(attr)) {

1 0

r2988 - trunk/src/site/rst
by tchemit＠users.nuiton.org Jan. 22, 2014

Jan. 22, 2014

Author: tchemit Date: 2014-01-22 15:00:13 +0100 (Wed, 22 Jan 2014) New Revision: 2988 Url: http://nuiton.org/projects/topia/repository/revisions/2988 Log: update migration doc Modified: trunk/src/site/rst/migrate_to_3.0.rst Modified: trunk/src/site/rst/migrate_to_3.0.rst =================================================================== --- trunk/src/site/rst/migrate_to_3.0.rst 2014-01-22 13:59:45 UTC (rev 2987) +++ trunk/src/site/rst/migrate_to_3.0.rst 2014-01-22 14:00:13 UTC (rev 2988) @@ -85,6 +85,8 @@ * ``TopiaEntity#TOPIA_CREATE_DATE`` devient ``TopiaEntity#PROPERTY_TOPIA_CREATE_DATE`` * ``TopiaEntity#TOPIA_VERSION`` devient ``TopiaEntity#PROPERTY_TOPIA_VERSION`` * ``TopiaEntityContextable#TOPIA_CONTEXT`` devient ``TopiaEntityContextable#PROPERTY_TOPIA_CONTEXT`` + * ``TopiaEntity#COMPOSITE`` devient ``TopiaEntityContextable#PROPERTY_COMPOSITE`` + * ``TopiaEntity#AGGREGATE`` devient ``TopiaEntityContextable#PROPERTY_AGGREGATE`` TopiaId @@ -101,12 +103,18 @@ ``topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory`` -TopiaContextImplementor est déprécié +TopiaContextImplementor est supprimé ------------------------------------ -Cette classe joue un rôle central dans ToPIA 2. Si nous avons essayé de limiter les impacts pour la version 3, il est -tout de même nécessaire d'appliquer quelques modifications. +Cette classe joue un rôle central dans ToPIA 2. Elle n'existe plus dans ToPIA 3. +TODO Expliquer par quoi remplacer. + +TopiaEntity modifié +------------------- + +Les méthodes (``getComposite()``, ``getAggregate()``) ont été déplacées vers le contrat ``TopiaEntityContextable``. + TopiaService#[preInit|postInit](...) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

r2987 - in trunk: topia-it/src/main/java/org/nuiton/topia/it/legacy topia-persistence/src/main/java/org/nuiton/topia/persistence topia-templates/src/main/java/org/nuiton/topia/templates
by tchemit＠users.nuiton.org Jan. 22, 2014

Jan. 22, 2014

Author: tchemit Date: 2014-01-22 14:59:45 +0100 (Wed, 22 Jan 2014) New Revision: 2987 Url: http://nuiton.org/projects/topia/repository/revisions/2987 Log: fixes #2776: Move .getComposite() and .getAggregate methods on entity's DAO Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/GeneratedPersonneTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/GeneratedPersonneTopiaDao.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/GeneratedPersonneTopiaDao.java 2014-01-22 13:59:19 UTC (rev 2986) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/GeneratedPersonneTopiaDao.java 2014-01-22 13:59:45 UTC (rev 2987) @@ -58,4 +58,13 @@ return null; } + @Override + public List<TopiaEntity> getComposite(E entity) { + return null; + } + + @Override + public List<TopiaEntity> getAggregate(E entity) { + return null; + } } 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 2014-01-22 13:59:19 UTC (rev 2986) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-01-22 13:59:45 UTC (rev 2987) @@ -288,4 +288,17 @@ */ Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E entity); + /** + * @param entity the entity on which search is done + * @return all objects that must be deleted if this object is deleted + * @since 3.0 + */ + List<TopiaEntity> getComposite(E entity); + + /** + * @param entity the entity on which search is done + * @return all objects that are aggregate with this instance, aggregate object are not removed automatically + * @since 3.0 + */ + List<TopiaEntity> getAggregate(E entity); } Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-01-22 13:59:19 UTC (rev 2986) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-01-22 13:59:45 UTC (rev 2987) @@ -46,12 +46,15 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.topia.persistence.TopiaDao; +import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.internal.support.HibernateTopiaJpaSupport; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -63,7 +66,7 @@ /** * To generate all <code>DAO</code> related classes for a given entity. - * + * * @author tchemit <chemit(a)codelutin.com> * @since 2.5.4 * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.templates.EntityDaoTransformer" @@ -134,13 +137,13 @@ } } } - + @Override public void transformFromInterface(ObjectModelInterface interfacez) { if (!TopiaGeneratorUtil.hasDaoStereotype(interfacez)) { return; } - + /** * EVO #636 : Manage extra operations for DAO from "dao" dependency * between an interface with stereotype <<dao>> (dependency client) and @@ -172,7 +175,7 @@ } return; } - + // keep only direct operations Collection<ObjectModelOperation> operations = interfacez.getOperations(); @@ -453,6 +456,9 @@ Set<ObjectModelClass> usagesForclass = usages.get(clazz); generateFindUsages(clazz, daoAbstractClass, usagesForclass); + + generateAggregateOperation(daoAbstractClass, clazz); + generateCompositeOperation(daoAbstractClass, clazz); } protected void generateDelete(ObjectModelClass clazz, @@ -1013,7 +1019,7 @@ * Obtain business operations of the DAO. * * This operations can not be generated, but must be written by developper. - * + * * @param clazz the clazz to test. * @return collections of extra operations, or empty collection if none found. * @deprecated Dao operation will not be generated anymore in a very close future @@ -1145,4 +1151,171 @@ ); } } + + protected void generateCompositeOperation(ObjectModelClass outputAbstract, ObjectModelClass input) { + + ObjectModelOperation operation = + addOperation(outputAbstract, "getComposite", + List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); + addParameter(operation, "E", "entity"); + addException(operation, TopiaException.class); + addAnnotation(outputAbstract, operation, Override.class); + + StringBuilder body; + + addImport(outputAbstract, ArrayList.class); + addImport(outputAbstract, List.class); + addImport(outputAbstract, TopiaDao.class); + + body = new StringBuilder("" +/*{ + List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); + + // pour tous les attributs rechecher les composites et les class d'asso + // on les ajoute dans tmp +}*/ + ); + for (ObjectModelAttribute attr : input.getAttributes()) { + + if (attr.referenceClassifier() && + TopiaGeneratorUtil.isEntity(attr.getClassifier())) { + + if (attr.isComposite()) { + String attrName = attr.getName(); + String getterName = getJavaBeanMethodName("get", attrName); + if (TopiaGeneratorUtil.isNMultiplicity(attr)) { + body.append("" +/*{ if (entity.<%=getterName%>() != null) { + tmp.addAll(entity.<%=getterName%>()); + } +}*/ + ); + } else { + body.append("" +/*{ tmp.add(entity.<%=getterName%>()); +}*/ + ); + } + } else if (attr.hasAssociationClass()) { + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName( + attr); + String assocClassFQN = TopiaGeneratorUtil.getSimpleName( + attr.getAssociationClass().getQualifiedName()); + String assocConcreteDaoClassName = assocClassFQN + "TopiaDao"; + String ref = "e." + getJavaBeanMethodName("get", assocAttrName); + if (!TopiaGeneratorUtil.isNMultiplicity(attr)) { + body.append("" +/*{ + if (<%=ref%> != null) { + tmp.add(<%=ref%>); + } +}*/ + ); + } else { + ObjectModelAttribute reverse = attr.getReverseAttribute(); + String reverseAttrName = reverse.getName(); + // On utilise pas l'attribut car il est potentiellement + // pas a jour, car pour les asso avec cardinalité + // personne ne fait de add. Ce qui est normal, mais + // pour pouvoir faire tout de meme des delete en cascade + // sur les asso, le champs est dans le mapping + // hibernate et donc il le faut aussi dans la classe + // sinon hibernate rale lorsqu'il charge l'objet +// if (<%=ref%> != null) { +// tmp.addAll(<%=ref%>); +// } + + body.append("" +/*{ + { + <%=assocConcreteDaoClassName%> dao = topiaDaoSupplier + .getDao(<%=assocClassFQN%>.class, <%=assocConcreteDaoClassName%>.class); + List<<%=assocClassFQN%>> findAllByProperties = dao.forProperties("<%=reverseAttrName%>", entity).findAll(); + if (findAllByProperties != null) { + tmp.addAll(findAllByProperties); + } + } +}*/ + ); + } + } + } + } + body.append("" +/*{ + // on refait un tour sur chaque entity de tmp pour recuperer leur + // composite + List<TopiaEntity> result = new ArrayList<TopiaEntity>(); + for (TopiaEntity e : tmp) { + if (e != null) { + result.add(e); + TopiaDao<TopiaEntity> dao = (TopiaDao<TopiaEntity>) topiaDaoSupplier.getDao(e.getClass()); + result.addAll(dao.getComposite(e)); + } + } + return result; + }*/ + ); + setOperationBody(operation, body.toString()); + } + + protected void generateAggregateOperation(ObjectModelClass outputAbstract, ObjectModelClass input) { + + ObjectModelOperation operation = + addOperation(outputAbstract, "getAggregate", + List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); + addParameter(operation, "E", "entity"); + addException(operation, TopiaException.class); + addAnnotation(outputAbstract, operation, Override.class); + + + StringBuilder body = new StringBuilder(); + + addImport(outputAbstract, ArrayList.class); + addImport(outputAbstract, List.class); + addImport(outputAbstract, TopiaDao.class); + body .append("" +/*{ + List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); + + // pour tous les attributs rechecher les composites et les class d'asso + // on les ajoute dans tmp +}*/ + ); + for (ObjectModelAttribute attr : input.getAttributes()) { + + if (attr.referenceClassifier() && + TopiaGeneratorUtil.isEntity(attr.getClassifier()) && + attr.isAggregate()) { + + String attrName = attr.getName(); + String getterName = getJavaBeanMethodName("get", attrName); + if (TopiaGeneratorUtil.isNMultiplicity(attr)) { + body.append("" +/*{ tmp.addAll(entity.<%=getterName%>()); +}*/ + ); + } else { + body.append("" +/*{ tmp.add(entity.<%=getterName%>()); +}*/ + ); + } + } + } + body.append("" +/*{ + // on refait un tour sur chaque entity de tmp pour recuperer leur + // composite + List<TopiaEntity> result = new ArrayList<TopiaEntity>(); + for (TopiaEntity e : tmp) { + result.add(e); + TopiaDao<TopiaEntity> dao = (TopiaDao<TopiaEntity>) topiaDaoSupplier.getDao(e.getClass()); + result.addAll(dao.getAggregate(e)); + } + return result; + }*/ + ); + setOperationBody(operation, body.toString()); + } }

1 0

r2986 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/internal topia-templates/src/main/java/org/nuiton/topia/templates
by tchemit＠users.nuiton.org Jan. 22, 2014

Jan. 22, 2014

Author: tchemit Date: 2014-01-22 14:59:19 +0100 (Wed, 22 Jan 2014) New Revision: 2986 Url: http://nuiton.org/projects/topia/repository/revisions/2986 Log: fixes #3009: clean TopiaEntity contract Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2014-01-20 08:36:03 UTC (rev 2985) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2014-01-22 13:59:19 UTC (rev 2986) @@ -28,7 +28,6 @@ import java.beans.VetoableChangeListener; import java.io.Serializable; import java.util.Date; -import java.util.List; /** * The TopiaEntity is the main interface for each generated entity. @@ -144,20 +143,6 @@ void notifyDeleted(); /** - * @return all objects that must be deleted if this object is deleted - * @deprecated from 3.0, method will be moved to entity's generated Dao(cf http://nuiton.org/issues/2776) - */ - @Deprecated - List<TopiaEntity> getComposite(); - - /** - * @return all objects that are aggregate with this instance, aggregate object are not removed automatically - * @deprecated from 3.0, method will be moved to entity's generated Dao (cf http://nuiton.org/issues/2776) - */ - @Deprecated - List<TopiaEntity> getAggregate(); - - /** * Route the entity using a {@code visitor}. * * @param visitor to used Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-20 08:36:03 UTC (rev 2985) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-22 13:59:19 UTC (rev 2986) @@ -24,8 +24,10 @@ * #L% */ +import java.util.List; + /** - * {@link TopiaEntity} with {@link org.nuiton.topia.persistence.TopiaDaoSupplier} support (injected by + * {@link TopiaEntity} with {@link TopiaDaoSupplier} support (injected by * {@link org.nuiton.topia.persistence.internal.AbstractTopiaDao} into entities). * * WARNING, it is not recommended to use this mechanism as it breaks the POJO's Hibernate approach. @@ -35,6 +37,16 @@ public interface TopiaEntityContextable extends TopiaEntity { /** + * @since 3.0 + */ + String PROPERTY_COMPOSITE = "composite"; + + /** + * @since 3.0 + */ + String PROPERTY_AGGREGATE = "aggregate"; + + /** * Update entity in persistence context. */ void update(); @@ -45,16 +57,30 @@ void delete(); /** - * Injects into this entity the given {@link org.nuiton.topia.persistence.TopiaDaoSupplier}, which can be used to + * Injects into this entity the given {@link TopiaDaoSupplier}, which can be used to * get any Dao instance. This is used to make {@link #update()} and {@link #delete()} implementation possible. * - * @param topiaDaoSupplier an initialized {@link org.nuiton.topia.persistence.TopiaDaoSupplier} instance + * @param topiaDaoSupplier an initialized {@link TopiaDaoSupplier} instance */ void setTopiaDaoSupplier(TopiaDaoSupplier topiaDaoSupplier); /** - * @return the currently injected {@link org.nuiton.topia.persistence.TopiaDaoSupplier} + * @return the currently injected {@link TopiaDaoSupplier} */ TopiaDaoSupplier getTopiaDaoSupplier(); + /** + * @return all objects that must be deleted if this object is deleted + * @deprecated from 3.0, method will be moved to entity's generated Dao(cf http://nuiton.org/issues/2776) + */ + @Deprecated + List<TopiaEntity> getComposite(); + + /** + * @return all objects that are aggregate with this instance, aggregate object are not removed automatically + * @deprecated from 3.0, method will be moved to entity's generated Dao (cf http://nuiton.org/issues/2776) + */ + @Deprecated + List<TopiaEntity> getAggregate(); + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java 2014-01-20 08:36:03 UTC (rev 2985) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java 2014-01-22 13:59:19 UTC (rev 2986) @@ -158,16 +158,16 @@ deleted = true; } - @Override - public List<TopiaEntity> getComposite() throws TopiaException { - throw new UnsupportedOperationException(); - } +// @Override +// public List<TopiaEntity> getComposite() throws TopiaException { +// throw new UnsupportedOperationException(); +// } +// +// @Override +// public List<TopiaEntity> getAggregate() throws TopiaException { +// throw new UnsupportedOperationException(); +// } - @Override - public List<TopiaEntity> getAggregate() throws TopiaException { - throw new UnsupportedOperationException(); - } - /** * On utilise la date de creation comme hash code, cette date ne varie pas * au cours du temps Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-01-20 08:36:03 UTC (rev 2985) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-01-22 13:59:19 UTC (rev 2986) @@ -39,6 +39,7 @@ import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntityVisitor; import org.nuiton.topia.persistence.internal.AbstractTopiaEntity; import org.nuiton.topia.persistence.TopiaDaoSupplier; @@ -182,10 +183,6 @@ // Add extra operations (defined on the entity) generateExtraOperations(input); - // Implement aggregate and composite operations - generateAggregateOperation(input); - generateCompositeOperation(input); - // Implement toString operation if (TopiaGeneratorUtil.generateToString(input, model)) { generateToStringOperation(input); @@ -200,8 +197,6 @@ generateSerialVersionUID(input, outputImpl); } - - // Clean data output after transformation clean(); } @@ -327,7 +322,9 @@ setSuperClass(outputAbstract, superClassName); } - addContextableMethods(input, outputAbstract); + if (TopiaGeneratorUtil.isContextable(input)) { + addContextableMethods(input, outputAbstract); + } } /** @@ -339,70 +336,100 @@ protected void addContextableMethods(ObjectModelClass input, ObjectModelClass outputAbstract) { - if (TopiaGeneratorUtil.isContextable(input)) { + addImport(outputAbstract, TopiaDaoSupplier.class); - addImport(outputAbstract, TopiaDaoSupplier.class); + // topiaContext attribute + ObjectModelAttribute topiaContextAttribute = addAttribute( + outputAbstract, "topiaDaoSupplier", TopiaDaoSupplier.class, null, + ObjectModelJavaModifier.PROTECTED, ObjectModelJavaModifier.TRANSIENT); + setDocumentation(topiaContextAttribute, + "TopiaDAO instance associated with the current \n" + + "instance. For internal usage only"); - // topiaContext attribute - ObjectModelAttribute topiaContextAttribute = addAttribute( - outputAbstract, "topiaDaoSupplier", TopiaDaoSupplier.class, null, - ObjectModelJavaModifier.PROTECTED, ObjectModelJavaModifier.TRANSIENT); - setDocumentation(topiaContextAttribute, - "TopiaDAO instance associated with the current \n" + - "instance. For internal usage only"); + ObjectModelOperation op; - ObjectModelOperation op = addOperation(outputAbstract, - "getTopiaDaoSupplier", TopiaDaoSupplier.class, - ObjectModelJavaModifier.PUBLIC); - setDocumentation(op,"@since 3.0"); - addAnnotation(outputAbstract, op, Override.class); - setOperationBody(op, "" + op = addOperation(outputAbstract, + "getTopiaDaoSupplier", TopiaDaoSupplier.class, + ObjectModelJavaModifier.PUBLIC); + setDocumentation(op,"@since 3.0"); + addAnnotation(outputAbstract, op, Override.class); + setOperationBody(op, "" /*{ return topiaDaoSupplier; }*/ - ); + ); - op = addOperation(outputAbstract, - "setTopiaDaoSupplier", "void", - ObjectModelJavaModifier.PUBLIC); - addException(op, TopiaException.class); - addParameter(op, TopiaDaoSupplier.class, "topiaDaoSupplier"); - setDocumentation(op, -// "@param context The context to set.\n" + -// "@throws TopiaException if trying to replace a context\n" + - "@since 3.0"); - addAnnotation(outputAbstract, op, Override.class); - setOperationBody(op, "" + op = addOperation(outputAbstract, + "setTopiaDaoSupplier", "void", + ObjectModelJavaModifier.PUBLIC); + addException(op, TopiaException.class); + addParameter(op, TopiaDaoSupplier.class, "topiaDaoSupplier"); + setDocumentation(op, + "@since 3.0"); + addAnnotation(outputAbstract, op, Override.class); + setOperationBody(op, "" /*{ if (this.topiaDaoSupplier == null) { this.topiaDaoSupplier = topiaDaoSupplier; -// } else { -// throw new TopiaException("TopiaContext replacement is forbidden"); } }*/ - ); + ); - op = addOperation(outputAbstract, "update", "void", - ObjectModelJavaModifier.PUBLIC); - addException(op, TopiaException.class); -// setDocumentation(op,"@since 2.5.3"); - addAnnotation(outputAbstract, op, Override.class); - setOperationBody(op, "" + String daoClassName = TopiaGeneratorUtil.getConcreteDaoName(input); + op = addOperation(outputAbstract, + "getInternalDao", daoClassName, + ObjectModelJavaModifier.PROTECTED); + setDocumentation(op,"@since 3.0"); + addAnnotation(outputAbstract, op, Override.class); + setOperationBody(op, "" /*{ - getTopiaDaoSupplier().getDao(<%=input.getName()%>.class).update(this); + <%=daoClassName%> result = getTopiaDaoSupplier().getDao(<%=input.getName()%>.class, <%=daoClassName%>); + return result; }*/ - ); + ); - op = addOperation(outputAbstract, "delete", "void", ObjectModelJavaModifier.PUBLIC); - addException(op, TopiaException.class); -// setDocumentation(op,"@since 2.5.3"); - addAnnotation(outputAbstract, op, Override.class); - setOperationBody(op, "" + op = addOperation(outputAbstract, "update", "void", + ObjectModelJavaModifier.PUBLIC); + addException(op, TopiaException.class); + addAnnotation(outputAbstract, op, Override.class); + setOperationBody(op, "" /*{ - getTopiaDaoSupplier().getDao(<%=input.getName()%>.class).delete(this); + getInternalDao().update(this); }*/ - ); - } + ); + + op = addOperation(outputAbstract, "delete", "void", ObjectModelJavaModifier.PUBLIC); + addException(op, TopiaException.class); + addAnnotation(outputAbstract, op, Override.class); + setOperationBody(op, "" +/*{ + getInternalDao().delete(this); + }*/ + ); + + op = addOperation(outputAbstract, "getComposite", + List.class.getName() + '<' + TopiaEntity.class.getName() + '>', + ObjectModelJavaModifier.PUBLIC); + addException(op, TopiaException.class); + addAnnotation(outputAbstract, op, Override.class); + setOperationBody(op, "" +/*{ + List<TopiaEntity> result = getInternalDao().getComposite(this); + return result; + }*/ + ); + + op = addOperation(outputAbstract, "getAggregate", + List.class.getName() + '<' + TopiaEntity.class.getName() + '>', + ObjectModelJavaModifier.PUBLIC); + addException(op, TopiaException.class); + addAnnotation(outputAbstract, op, Override.class); + setOperationBody(op, "" +/*{ + List<TopiaEntity> result = getInternalDao().getAggregate(this); + return result; + }*/ + ); } protected boolean isGenerateInterface(ObjectModelClass input) { @@ -1149,6 +1176,7 @@ addOperation(outputInterface, getJavaBeanMethodName("get", attrName) + "TopiaIds", collectionInterface + "<String>", ObjectModelJavaModifier.PACKAGE); + addImport(outputAbstract, TopiaEntity.class); // Implementation ObjectModelOperation implOperation = createImplOperation(interfaceOperation); @@ -1386,184 +1414,6 @@ } - protected void generateCompositeOperation(ObjectModelClass input) { - - ObjectModelOperation operation = - addOperation(outputAbstract, "getComposite", - List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); - - addException(operation, TopiaException.class); - addAnnotation(outputAbstract, operation, Override.class); - - StringBuilder body; - if (!TopiaGeneratorUtil.isContextable(input)) { - body = new StringBuilder("" -/*{ - throw new UnsupportedOperationException("Since ToPIA 3.0, 'getComposite' is only available for contextable entities"); - }*/ - ); - } else { - addImport(outputAbstract, ArrayList.class); - addImport(outputAbstract, List.class); - - body = new StringBuilder("" -/*{ - List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); - - // pour tous les attributs rechecher les composites et les class d'asso - // on les ajoute dans tmp -}*/ - ); - for (ObjectModelAttribute attr : input.getAttributes()) { - - if (attr.referenceClassifier() && - TopiaGeneratorUtil.isEntity(attr.getClassifier())) { - - if (attr.isComposite()) { - String attrName = attr.getName(); - String getterName = getJavaBeanMethodName("get", attrName); - if (TopiaGeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ if (<%=getterName%>() != null) { - tmp.addAll(<%=getterName%>()); - } -}*/ - ); - } else { - body.append("" -/*{ tmp.add(<%=getterName%>()); -}*/ - ); - } - } else if (attr.hasAssociationClass()) { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName( - attr); - String assocClassFQN = TopiaGeneratorUtil.getSimpleName( - attr.getAssociationClass().getQualifiedName()); - String ref = "this." + TopiaGeneratorUtil.toLowerCaseFirstLetter( - assocAttrName); - if (!TopiaGeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ - if (<%=ref%> != null) { - tmp.add(<%=ref%>); - } -}*/ - ); - } else { - ObjectModelAttribute reverse = attr.getReverseAttribute(); - String reverseAttrName = reverse.getName(); - // On utilise pas l'attribut car il est potentiellement - // pas a jour, car pour les asso avec cardinalité - // personne ne fait de add. Ce qui est normal, mais - // pour pouvoir faire tout de meme des delete en cascade - // sur les asso, le champs est dans le mapping - // hibernate et donc il le faut aussi dans la classe - // sinon hibernate rale lorsqu'il charge l'objet - // if (<%=ref%> != null) { - // tmp.addAll(<%=ref%>); - // } - - body.append("" -/*{ - { - org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = getTopiaContext().getDao(<%=assocClassFQN%>.class); - List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); - if (findAllByProperties != null) { - tmp.addAll(findAllByProperties); - } - } -}*/ - ); - } - } - } - } - body.append("" -/*{ - // on refait un tour sur chaque entity de tmp pour recuperer leur - // composite - List<TopiaEntity> result = new ArrayList<TopiaEntity>(); - for (TopiaEntity entity : tmp) { - if (entity != null) { - result.add(entity); - result.addAll(entity.getComposite()); - } - } - return result; - }*/ - ); - } - - setOperationBody(operation, body.length() == 0 ? " " : body.toString()); - } - - protected void generateAggregateOperation(ObjectModelClass input) { - - ObjectModelOperation operation = - addOperation(outputAbstract, "getAggregate", - List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); - - addException(operation, TopiaException.class); - addAnnotation(outputAbstract, operation, Override.class); - - - StringBuilder body = new StringBuilder(); - if (!TopiaGeneratorUtil.isContextable(input)) { - body = new StringBuilder("" -/*{ - throw new UnsupportedOperationException("Since ToPIA 3.0, 'getComposite' is only available for contextable entities"); - }*/ - ); - } else { - - addImport(outputAbstract, ArrayList.class); - addImport(outputAbstract, List.class); - body .append("" -/*{ - List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); - - // pour tous les attributs rechecher les composites et les class d'asso - // on les ajoute dans tmp -}*/ - ); - for (ObjectModelAttribute attr : input.getAttributes()) { - - if (attr.referenceClassifier() && - TopiaGeneratorUtil.isEntity(attr.getClassifier()) && - attr.isAggregate()) { - - String attrName = attr.getName(); - String getterName = getJavaBeanMethodName("get", attrName); - if (TopiaGeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ tmp.addAll(<%=getterName%>()); -}*/ - ); - } else { - body.append("" -/*{ tmp.add(<%=getterName%>()); -}*/ - ); - } - } - } - body.append("" -/*{ - // on refait un tour sur chaque entity de tmp pour recuperer leur - // composite - List<TopiaEntity> result = new ArrayList<TopiaEntity>(); - for (TopiaEntity entity : tmp) { - result.add(entity); - result.addAll(entity.getAggregate()); - } - return result; - }*/ - ); - } - setOperationBody(operation, body.length() == 0 ? " " : body.toString()); - } - // ------------------------------------------------------------------------- // Helpers // -------------------------------------------------------------------------

1 0

r2985 - in trunk: src/site/rst/devel topia-it/src/it/ANOMALIE-1640/src/test/resources topia-it/src/test/java/org/nuiton/topia/persistence/internal topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-service-migration/src/main/java/org/nuiton/topia/migration
by athimel＠users.nuiton.org Jan. 20, 2014

Jan. 20, 2014

Author: athimel Date: 2014-01-20 09:36:03 +0100 (Mon, 20 Jan 2014) New Revision: 2985 Url: http://nuiton.org/projects/topia/repository/revisions/2985 Log: restore copyrights next to commit r2981 Modified: trunk/src/site/rst/devel/SchemaMigration.rst trunk/src/site/rst/devel/project.rst trunk/topia-it/src/it/ANOMALIE-1640/src/test/resources/log4j.properties trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java Modified: trunk/src/site/rst/devel/SchemaMigration.rst =================================================================== --- trunk/src/site/rst/devel/SchemaMigration.rst 2014-01-18 20:43:10 UTC (rev 2984) +++ trunk/src/site/rst/devel/SchemaMigration.rst 2014-01-20 08:36:03 UTC (rev 2985) @@ -4,7 +4,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2004 - 2014 CodeLutin +.. * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Lesser General Public License as Modified: trunk/src/site/rst/devel/project.rst =================================================================== --- trunk/src/site/rst/devel/project.rst 2014-01-18 20:43:10 UTC (rev 2984) +++ trunk/src/site/rst/devel/project.rst 2014-01-20 08:36:03 UTC (rev 2985) @@ -4,7 +4,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2004 - 2014 CodeLutin +.. * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU Lesser General Public License as Modified: trunk/topia-it/src/it/ANOMALIE-1640/src/test/resources/log4j.properties =================================================================== --- trunk/topia-it/src/it/ANOMALIE-1640/src/test/resources/log4j.properties 2014-01-18 20:43:10 UTC (rev 2984) +++ trunk/topia-it/src/it/ANOMALIE-1640/src/test/resources/log4j.properties 2014-01-20 08:36:03 UTC (rev 2985) @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2004 - 2014 CodeLutin +# Copyright (C) 2004 - 2014 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as 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-18 20:43:10 UTC (rev 2984) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-01-20 08:36:03 UTC (rev 2985) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2014-01-18 20:43:10 UTC (rev 2984) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2014-01-20 08:36:03 UTC (rev 2985) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2014 CodeLutin, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-18 20:43:10 UTC (rev 2984) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-20 08:36:03 UTC (rev 2985) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java 2014-01-18 20:43:10 UTC (rev 2984) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java 2014-01-20 08:36:03 UTC (rev 2985) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2014 CodeLutin, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java 2014-01-18 20:43:10 UTC (rev 2984) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java 2014-01-20 08:36:03 UTC (rev 2985) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as 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-18 20:43:10 UTC (rev 2984) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java 2014-01-20 08:36:03 UTC (rev 2985) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin + * Copyright (C) 2004 - 2014 CodeLutin, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as

1 0

r2984 - in trunk: topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract topia-it/src/main/java/org/nuiton/topia/it/legacy topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/beangen topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/deletetest topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence topia-it/src/test/java/org/nuiton/topia/it/legacy topia-it/src/test/java/org/nuiton
by athimel＠users.nuiton.org Jan. 18, 2014

Jan. 18, 2014

Author: athimel Date: 2014-01-18 21:43:10 +0100 (Sat, 18 Jan 2014) New Revision: 2984 Url: http://nuiton.org/projects/topia/repository/revisions/2984 Log: Uniformize JAVA classes first lines : Always declare package before license, and license before imports Modified: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/AbstractTopiaTestEntity.java 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/Gender.java trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/Title.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/deletetest/AbstractContact2TopiaDao.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/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/package-info.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.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/TopiaDatabase.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/TopiaConnectionProviderHardCoded.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.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/persistence/util/CollectorTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/EntityOperatorTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityBinderTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityHelperTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTester.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTesterTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/evo1912/EntityDTOTransformerTest.java trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.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/it/legacy/topiatest/service/package-info.java trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java trunk/topia-persistence/src/main/java/org/nuiton/topia/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextAdapter.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/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/package-info.java trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/package-info.java trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/package-info.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-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDTOTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/package-info.java Modified: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java =================================================================== --- trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.testabstract; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.testabstract; import org.junit.Rule; import org.junit.Test; Modified: trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java =================================================================== --- trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaDatabase.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.testabstract; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.testabstract; import org.nuiton.topia.junit.AbstractDatabaseResource; Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/AbstractTopiaTestEntity.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/AbstractTopiaTestEntity.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/AbstractTopiaTestEntity.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -24,7 +24,6 @@ * #L% */ - import org.nuiton.topia.persistence.internal.AbstractTopiaEntity; /** 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/AbstractExtraDAOEntityTopiaDao.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.topiatest; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/Gender.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/Gender.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/Gender.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.topiatest; public enum Gender { MALE, FEMALE Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/Title.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/Title.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/Title.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.topiatest; /** * To test http://nuiton.org/issues/1732. 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/beangen/RoueImpl.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest.beangen; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.topiatest.beangen; - import org.nuiton.topia.it.legacy.topiatest.Product; /** Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/deletetest/AbstractContact2TopiaDao.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/deletetest/AbstractContact2TopiaDao.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/deletetest/AbstractContact2TopiaDao.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest.deletetest; + /* * #%L * ToPIA :: IT @@ -22,9 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.topiatest.deletetest; - - import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.it.legacy.topiatest.Company; import org.nuiton.topia.it.legacy.topiatest.Employe; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest.persistence; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.topiatest.persistence; import org.nuiton.topia.persistence.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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest.persistence; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.topiatest.persistence; /** * Created: 11 mai 2010 Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/package-info.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,8 @@ +/** + * Contains persistent entities for Tests. + */ +package org.nuiton.topia.it.legacy.topiatest.persistence; + /* * #%L * ToPIA :: IT @@ -7,7 +12,7 @@ * 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 + * 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. * @@ -21,8 +26,3 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/** - * Contains persistent entities for Tests. - */ -package org.nuiton.topia.it.legacy.topiatest.persistence; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TestHelper.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaApplicationContextCacheTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.logging.Log; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaDatabase.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaDatabase.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/TopiaDatabase.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy; import org.nuiton.topia.junit.AbstractDatabaseResource; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/EntityStateTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.framework; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.framework; - import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.persistence.event.EntityState; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderHardCoded.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.framework; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.framework; import java.sql.Connection; import java.sql.DriverManager; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaConnectionProviderTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.framework; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.framework; import java.io.File; import java.util.Locale; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaContextReplicateTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.framework; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.framework; import java.io.File; import java.util.Properties; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/framework/TopiaUtilTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.framework; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.framework; - import java.util.regex.Matcher; import java.util.regex.Pattern; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/generator/TopiaTestCase.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.generator; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.generator; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/ExportXMLVisitor.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.PropertyValueException; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/CollectorTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/CollectorTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/CollectorTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence.util; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence.util; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.AfterClass; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/EntityOperatorTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/EntityOperatorTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/EntityOperatorTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence.util; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence.util; - import org.junit.After; import org.junit.AfterClass; import org.junit.Before; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityBinderTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityBinderTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityBinderTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence.util; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence.util; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityHelperTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityHelperTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityHelperTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence.util; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence.util; - import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTester.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTester.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTester.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence.util; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence.util; - import org.junit.After; import org.junit.Assert; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTesterTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTesterTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/util/TopiaEntityRefTesterTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.persistence.util; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.persistence.util; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/ano1882/DAOAbstractTransformerTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.test.ano1882; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.test.ano1882; import java.util.Arrays; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/evo1912/EntityDTOTransformerTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/evo1912/EntityDTOTransformerTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/test/evo1912/EntityDTOTransformerTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.test.evo1912; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.test.evo1912; import org.junit.Assert; import org.junit.Test; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/EnumTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.topiatest; import org.junit.Assert; import org.junit.Rule; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/deletetest/DeleteEntityTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest.deletetest; + /* * #%L * ToPIA :: IT @@ -22,17 +24,6 @@ * #L% */ - -/** - * DeleteEntityTest.java - * - * Created: 4 juin 2009 - * - * @author Florian Desbois <fdesbois(a)codelutin.com> - */ - -package org.nuiton.topia.it.legacy.topiatest.deletetest; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/FakeService.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest.service; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.it.legacy.topiatest.service; - import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/TestService.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.it.legacy.topiatest.service; + /* * #%L * ToPIA :: IT @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.it.legacy.topiatest.service; import org.junit.Ignore; import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; Modified: trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/package-info.java =================================================================== --- trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/topiatest/service/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,9 @@ +/** + * This package contains classes which implements {@link + * org.nuiton.topia.persistence.TopiaService} to test services API. + */ +package org.nuiton.topia.it.legacy.topiatest.service; + /* * #%L * ToPIA :: IT @@ -7,7 +13,7 @@ * 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 + * 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. * @@ -21,9 +27,3 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/** - * This package contains classes which implements {@link - * org.nuiton.topia.persistence.TopiaService} to test services API. - */ -package org.nuiton.topia.it.legacy.topiatest.service; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.internal; + /* * #%L * ToPIA :: IT @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.internal; - import java.util.List; import java.util.Map; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/package-info.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,27 +1,3 @@ -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * 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 - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - /** * TODO-FD20100507 : Need update this javadoc for ToPIA 2.4 * @@ -135,3 +111,27 @@ * </pre> */ package org.nuiton.topia; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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 + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence; - /** * {@link TopiaEntity} with {@link org.nuiton.topia.persistence.TopiaDaoSupplier} support (injected by * {@link org.nuiton.topia.persistence.internal.AbstractTopiaDao} into entities). Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.persistence; /** * Use this contract on a object which use a {@code TopiaContext} as a Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextAdapter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextAdapter.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaContextAdapter.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.persistence.event; /** * Adapter pattern of {@link TopiaSchemaListener}. 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/TopiaEntityVetoable.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -9,16 +9,16 @@ * 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% Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/package-info.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,9 @@ +/** + * Events used for ToPIA services. + * TODO-fdesbois-20100507 : Need more javadoc. + */ +package org.nuiton.topia.persistence.event; + /* * #%L * ToPIA :: Persistence @@ -7,7 +13,7 @@ * 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 + * 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. * @@ -21,9 +27,3 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/** - * Events used for ToPIA services. - * TODO-fdesbois-20100507 : Need more javadoc. - */ -package org.nuiton.topia.persistence.event; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.internal; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.internal; - import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.internal; + /* * #%L * ToPIA :: Persistence @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.persistence.internal; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Collector.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.legacy; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.legacy; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/DBMapping.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.legacy; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.legacy; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.exception.SQLGrammarException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.legacy; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.legacy; - import org.apache.commons.beanutils.PropertyUtilsBean; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.legacy; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.legacy; - import org.nuiton.topia.persistence.TopiaException; import java.util.Collection; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.legacy; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.legacy; - import java.io.Serializable; import java.util.Map; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/AssociationMeta.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,4 +1,5 @@ package org.nuiton.topia.persistence.metadata; + /* * #%L * ToPIA :: Persistence Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/ColumnMeta.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,4 +1,5 @@ package org.nuiton.topia.persistence.metadata; + /* * #%L * ToPIA :: Persistence Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,4 +1,5 @@ package org.nuiton.topia.persistence.metadata; + /* * #%L * ToPIA :: Persistence @@ -23,7 +24,6 @@ * #L% */ - import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/MetaFilenameAware.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.metadata; + /* * #%L * ToPIA :: Persistence @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.persistence.metadata; import org.nuiton.topia.persistence.TopiaEntityEnum; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,4 +1,5 @@ package org.nuiton.topia.persistence.metadata; + /* * #%L * ToPIA :: Persistence Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,4 +1,5 @@ package org.nuiton.topia.persistence.metadata; + /* * #%L * ToPIA :: Persistence Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,11 @@ +/** + * Package to define metadata over {@link org.nuiton.topia.persistence.TopiaEntity}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.12 + */ +package org.nuiton.topia.persistence.metadata; + /* * #%L * ToPIA :: Persistence @@ -21,11 +29,3 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/** - * Package to define metadata over {@link org.nuiton.topia.persistence.TopiaEntity}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.6.12 - */ -package org.nuiton.topia.persistence.metadata; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,27 +1,3 @@ -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * 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 - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - /** * This package contains most of the needed contracts when using ToPIA. * @@ -48,3 +24,27 @@ * */ package org.nuiton.topia.persistence; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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 + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/support/TopiaSqlQuery.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.support; + /* * #%L * ToPIA :: Persistence @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.persistence.support; import java.sql.Connection; import java.sql.PreparedStatement; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/DiffState.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.util; - import java.util.ArrayList; import java.util.EnumMap; import java.util.List; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.util; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.util; - import java.util.HashMap; import java.util.Map; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityBinder.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.util; - import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.legacy.Loador; import org.nuiton.util.beans.Binder; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.util; - import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityIdsMap.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.persistence.util; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.persistence.util; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityRef.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence.util; + /* * #%L * ToPIA :: Persistence @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.persistence.util; - import org.nuiton.topia.persistence.TopiaEntity; /** Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -9,8 +9,8 @@ * 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, @@ -18,7 +18,7 @@ * 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% Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/HqlAndParametersBuilderTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,4 +1,5 @@ package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence Modified: trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/package-info.java =================================================================== --- trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,11 @@ +/** + * Package for csv import of entities. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.12 + */ +package org.nuiton.topia.service.csv.in; + /* * #%L * ToPIA :: Service Csv @@ -21,11 +29,3 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/** - * Package for csv import of entities. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.6.12 - */ -package org.nuiton.topia.service.csv.in; Modified: trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/package-info.java =================================================================== --- trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,11 @@ +/** + * Package for csv export of entities. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.12 + */ +package org.nuiton.topia.service.csv.out; + /* * #%L * ToPIA :: Service Csv @@ -21,11 +29,3 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/** - * Package for csv export of entities. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.6.12 - */ -package org.nuiton.topia.service.csv.out; Modified: trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/package-info.java =================================================================== --- trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/package-info.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,11 @@ +/** + * Base package for csv import and export of entities. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.12 + */ +package org.nuiton.topia.service.csv; + /* * #%L * ToPIA :: Service Csv @@ -21,11 +29,3 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ - -/** - * Base package for csv import and export of entities. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.6.12 - */ -package org.nuiton.topia.service.csv; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration; + /* * #%L * ToPIA :: Service Migration @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/MigrationServiceException.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration; + /* * #%L * ToPIA :: Service Migration @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.migration; - /** * TopiaMigrationServiceException.java * 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration; + /* * #%L * ToPIA :: Service Migration @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.migration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClassNG.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration; + /* * #%L * ToPIA :: Service Migration @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByMethod.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration; + /* * #%L * ToPIA :: Service Migration @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration; + /* * #%L * ToPIA :: Service Migration @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.migration; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationService.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration; + /* * #%L * ToPIA :: Service Migration @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.migration; - import org.nuiton.topia.persistence.TopiaService; /** Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration.mappings; + /* * #%L * ToPIA :: Service Migration @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.migration.mappings; - import org.apache.commons.lang3.StringUtils; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersionDAO.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.migration.mappings; + /* * #%L * ToPIA :: Service Migration @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.migration.mappings; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationContext.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.replication; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.replication; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperation.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication; - import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationProvider.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.replication; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationOperationUndoable.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication; - import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.replication.model.ReplicationOperationDef; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationService.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -21,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.topia.replication; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationServiceImpl.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationLink.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.model; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.model; - import java.util.Collections; import java.util.HashSet; import java.util.Set; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.model; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.model; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationNode.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.model; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.model; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationDef.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.model; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.model; - import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.replication.TopiaReplicationOperation; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationOperationPhase.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.model; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.model; - import org.nuiton.topia.replication.operation.Duplicate; /** Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.operation; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.operation; - import java.util.Collection; import java.util.Collections; import java.util.List; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/DettachAssociation.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.operation; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.operation; - import java.util.List; import org.apache.commons.logging.Log; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.operation; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.operation; - import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.operation; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.operation; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/AbstractTopiaReplicationServiceTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication; - import org.apache.commons.logging.Log; import org.junit.Assert; import org.nuiton.topia.persistence.TopiaApplicationContext; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationOperationTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplAllTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/TopiaReplicationServiceImplTest.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/FakeOperation.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.operation; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.operation; - import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.operation; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.operation; - import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java =================================================================== --- trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java 2014-01-18 18:21:51 UTC (rev 2983) +++ trunk/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UnregistredOperation.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,3 +1,5 @@ +package org.nuiton.topia.replication.operation; + /* * #%L * ToPIA :: Service Replication @@ -22,8 +24,6 @@ * #L% */ -package org.nuiton.topia.replication.operation; - import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaEntity; 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDTOTransformer.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,4 +1,3 @@ - package org.nuiton.topia.templates; /* 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-18 18:21:51 UTC (rev 2983) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/package-info.java 2014-01-18 20:43:10 UTC (rev 2984) @@ -1,27 +1,3 @@ -/* - * #%L - * ToPIA :: Templates - * $Id$ - * $HeadURL$ - * %% - * 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 - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - /** * TODO-FD20100507 : Need update this javadoc for ToPIA 2.4 * @@ -115,3 +91,27 @@ * @author poussin <poussin(a)codelutin.com> */ package org.nuiton.topia.templates; + +/* + * #%L + * ToPIA :: Templates + * $Id$ + * $HeadURL$ + * %% + * 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 + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */

1 0

Jan. 18, 2014

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(a)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(a)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(a)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(a)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(a)codelutin.com> - * @version $Revision$ - * - * 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(a)codelutin.com> - * @version $Revision$ - * - * 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$ - * - * 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$ - * - * 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$ - * - * 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$ - * - * 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(a)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(a)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(a)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}. - * - * 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. + * + * It may be used in a Dao to ease dynamic construction of queries. * - * It may be used in a Dao to ease dynamic construction of queries. - * * @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. + * * 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; /** - * 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. + * 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. + * + * 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". * - * 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". - * * @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. - * - * Example : for a model Test, we will have a - * <code>TestDOAHelper.TestEntityEnum</code> enumeration generated. - * - * The contract gives some informations about the classes for any entity dealed + * 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> * - * - 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. - * - * - 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(a)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. * - * 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. * - * 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. * * Example : A -> B * <pre> - * EntityEnum.A.accept(Class<A>) -> true - * EntityEnum.A.accept(Class) -> false - * EntityEnum.B.accept(Class) -> true - * EntityEnum.B.accept(Class<A>) -> false + * XxxEntityEnum.A.accept(Class<A>) -> true + * XxxEntityEnum.A.accept(Class) -> false + * XxxEntityEnum.B.accept(Class) -> 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 * * Created: 23 déc. 2005 23:03:36 + * + * Since version 3.0, this exception is now a RuntimeException has it represents only technical issues. * * @author poussin <poussin(a)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 + * * Created: 23 déc. 2005 23:04:28 * * @author poussin <poussin(a)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}) + * + * 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. * - * 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. - * + * * 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. - * + * * This method duplicates {@link #tryFindFirst()} * but allows you to prevent using Guava in you project. - * + * * 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. + * + * 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(a)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: * * <li>public static final String SERVICE_NAME = "monservice"; * - * 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. + * + * Created: 8 oct. 06 17:15:52 * * @author poussin <poussin(a)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(a)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 * * Created: 5 janv. 2006 00:47:51 * * @author poussin <poussin(a)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(a)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(a)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(a)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(a)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(a)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(a)codelutin.com> * @author tchemit <tchemit(a)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(a)codelutin.com> * @author tchemit <tchemit(a)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(a)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(a)codelutin.com> * @author tchemit <tchemit(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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(a)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. * * @author poussin <poussin(a)codelutin.com> - * @version $Id$ */ package org.nuiton.topia.templates;

1 0

r2982 - in trunk: topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/internal topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support topia-persistence/src/test/java/org/nuiton/topia/persistence topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out topia-tem
by athimel＠users.nuiton.org Jan. 17, 2014

Jan. 17, 2014

Author: athimel Date: 2014-01-17 23:38:39 +0100 (Fri, 17 Jan 2014) New Revision: 2982 Url: http://nuiton.org/projects/topia/repository/revisions/2982 Log: refs #552 Clean API - TopiaDao - TopiaDaoSupplier - TopiaEntities - visitors - TopiaEntity - TopiaApplicationContextCache - TopiaTransaction - TopiaIdFactory - TopiaTransaction - ... Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityVisitor.java Removed: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Abstract.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-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.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/TopiaApplicationContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDaoSupplier.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaException.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceContext.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransaction.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java Modified: trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Abstract.java =================================================================== --- trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Abstract.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Abstract.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -24,9 +24,9 @@ * #L% */ +import org.nuiton.topia.persistence.TopiaEntityVisitor; import org.nuiton.topia.persistence.internal.AbstractTopiaEntity; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.EntityVisitor; /** * Created: 11 mai 2010 @@ -72,7 +72,7 @@ } @Override - public void accept(EntityVisitor visitor) throws TopiaException { + public void accept(TopiaEntityVisitor visitor) throws TopiaException { visitor.start(this); visitor.visit(this, ATTR_1, String.class, attr1); visitor.visit(this, ATTR_2, String.class, attr2); 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 17:38:55 UTC (rev 2981) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/EntityVisitorExportXmlTest.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -30,6 +30,7 @@ import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.it.legacy.TopiaDatabase; +import org.nuiton.topia.persistence.TopiaEntityVisitor; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.it.legacy.TopiaTestTopiaPersistenceContext; import org.nuiton.topia.it.legacy.topiatest.Address; @@ -41,7 +42,6 @@ import org.nuiton.topia.it.legacy.topiatest.Employe; import org.nuiton.topia.it.legacy.topiatest.EmployeTopiaDao; import org.nuiton.topia.persistence.DepthEntityVisitor; -import org.nuiton.topia.persistence.EntityVisitor; /** * Test de visitor. @@ -121,8 +121,8 @@ CompanyTopiaDao companyDAO = context.getCompanyDao(); Company clCompany = companyDAO.findByName("CodeLutin"); - EntityVisitor delegateVisitor = new ExportXMLVisitor(); - EntityVisitor visitor = new DepthEntityVisitor(delegateVisitor); + TopiaEntityVisitor delegateVisitor = new ExportXMLVisitor(); + TopiaEntityVisitor visitor = new DepthEntityVisitor(delegateVisitor); clCompany.accept(visitor); if (log.isInfoEnabled()) { 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 17:38:55 UTC (rev 2981) +++ trunk/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/ExportXMLVisitor.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; -import org.nuiton.topia.persistence.EntityVisitor; +import org.nuiton.topia.persistence.TopiaEntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; /** @@ -41,7 +41,7 @@ * By : $Author$ */ @Ignore -public class ExportXMLVisitor implements EntityVisitor { +public class ExportXMLVisitor implements TopiaEntityVisitor { /** log. */ private static Log log = LogFactory.getLog(ExportXMLVisitor.class); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/DepthEntityVisitor.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,39 +24,37 @@ * #L% */ -package org.nuiton.topia.persistence; +import java.util.ArrayList; +import java.util.Collection; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.ArrayList; -import java.util.Collection; - /** - * Parcourt du graphe d'entité en profondeur. + * Visitor to run through the entity graph by depth. * * @author echatellier <chatellier(a)codelutin.com> * @author tchemit <tchemit(a)codelutin.com> - * @version $Id$ */ -public class DepthEntityVisitor implements EntityVisitor { +public class DepthEntityVisitor implements TopiaEntityVisitor { - /** Class logger. */ private static Log log = LogFactory.getLog(DepthEntityVisitor.class); - /** Cache of already explored entities. */ + /** + * Cache of already explored entities. + */ protected Collection<TopiaEntity> alreadyExplored; /** - * Le visiteur metier (optionel). + * The business visitor (optional) */ - protected EntityVisitor delegateVisitor; + protected TopiaEntityVisitor delegateVisitor; public DepthEntityVisitor() { this(null); } - public DepthEntityVisitor(EntityVisitor delegateVisitor) { + public DepthEntityVisitor(TopiaEntityVisitor delegateVisitor) { alreadyExplored = new ArrayList<TopiaEntity>(); @@ -95,7 +95,7 @@ @Override public void visit(TopiaEntity e, String propertyName, - Class<?> collectionType, Class<?> type,Object value) { + Class<?> collectionType, Class<?> type, Object value) { Collection<?> cValue = (Collection<?>) value; if (cValue != null && !cValue.isEmpty()) { Deleted: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -1,113 +0,0 @@ -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * 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 - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.topia.persistence; - -/** - * The contract of a visitor of any {@link TopiaEntity}. - * - * Created: 28 janv. 2009 18:10:34 - * - * @author bpoussin <poussin(a)codelutin.com> - * @author tchemit <chemit(a)codelutin.com> - * @version $Id$ - */ -public interface EntityVisitor { - - /** - * Start the visit of the given entity. - * - * @param entity the visited entity - */ - void start(TopiaEntity entity); - - /** - * Ends the visit of the given entity. - * - * @param entity the visited entity - */ - void end(TopiaEntity entity); - - /** - * Visit a none indexed property for the given entity. - * - * The property visited is defined by the other parameters. - * - * @param entity the visited entity - * @param propertyName the name of the visited property - * @param type the type of the visited property - * @param value the value of the visited property - */ - void visit(TopiaEntity entity, - String propertyName, - Class<?> type, - Object value); - - /** - * Visit a collection property for the given entity. - * - * The property visited is defined by the other parameters. - * - * @param entity the visited entity - * @param propertyName the name of the visited property - * @param collectionType the type of the visited collection - * @param type the type of the visited property - * @param value the value of the visited property - */ - void visit(TopiaEntity entity, - String propertyName, - Class<?> collectionType, - Class<?> type, - Object value); - - /** - * Visit a indexed value from a collection property for the given entity. - * - * The property visited is defined by the other parameters. - * - * @param entity the visited entity - * @param propertyName the name of the visited property - * @param collectionType the type of the container of the visited property - * @param type the type of the visited property - * @param index the index of the visited property in his container - * @param value the value of the visited property - */ - void visit(TopiaEntity entity, - String propertyName, - Class<?> collectionType, - Class<?> type, - int index, - Object value); - - /** - * Reset all states of the visitor. - * - * If you use internal states inside the visitor, this method should clean - * all of them. - * - * This method should be invoked after usage of the visitor. - */ - void clear(); - -} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HorizontalEntityVisitor.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -1,3 +1,5 @@ +package org.nuiton.topia.persistence; + /* * #%L * ToPIA :: Persistence @@ -22,42 +24,44 @@ * #L% */ -package org.nuiton.topia.persistence; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** - * Parcourt en largeur du modele et délegation à un autre visiteur. - * + * Visitor to run through entities horizontally, then delegate visiting to another visitor. + * * @author echatellier <chatellier(a)codelutin.com> * @author tchemit <tchemit(a)codelutin.com> - * @version $Id$ */ -public class HorizontalEntityVisitor implements EntityVisitor { +public class HorizontalEntityVisitor implements TopiaEntityVisitor { - /** Class logger. */ private static Log log = LogFactory.getLog(HorizontalEntityVisitor.class); - /** Delegate visitor. */ - protected EntityVisitor delegateVisitor; + /** + * Delegate visitor. + */ + protected TopiaEntityVisitor delegateVisitor; - /** Cache used to remember entity during exploration. */ + /** + * Cache used to remember entity during exploration. + */ protected List<TopiaEntity> alreadyExplored; - /** Entity to be visited later. */ + /** + * Entity to be visited later. + */ protected List<TopiaEntity> toVisitEntities; /** * Constructor. - * - * @param delegateVisitor delegate visitor + * + * @param delegateVisitor visitor to delegate visiting */ - public HorizontalEntityVisitor(EntityVisitor delegateVisitor) { + public HorizontalEntityVisitor(TopiaEntityVisitor delegateVisitor) { this.delegateVisitor = delegateVisitor; alreadyExplored = new ArrayList<TopiaEntity>(); toVisitEntities = new ArrayList<TopiaEntity>(); @@ -85,7 +89,7 @@ @Override public void visit(TopiaEntity entity, String propertyName, - Class<?> collectionType,Class<?> type, Object value) { + Class<?> collectionType, Class<?> type, Object value) { Collection<?> values = (Collection<?>) value; if (values != null && !values.isEmpty()) { int i = 0; @@ -113,7 +117,7 @@ @Override public void end(TopiaEntity entity) { delegateVisitor.end(entity); - + // here, must revisit all remembered entities List<TopiaEntity> currentEntities = new ArrayList<TopiaEntity>(toVisitEntities); 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 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -37,13 +37,12 @@ import java.util.Set; /** - * A builder to create syntactically correct hql and associated parameters - * given properties or after various constraint adds. + * A builder to create syntactically correct hql and associated parameters given properties or after various constraint + * adds. * - * It may be used in a dao to ease dynamic construction of queries. + * It may be used in a Dao to ease dynamic construction of queries. * * @since 3.0 - * @param <E> */ public class HqlAndParametersBuilder<E extends TopiaEntity> { 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 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/QueryMissingOrderException.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -27,22 +27,21 @@ import java.util.Map; /** - * If you get this exception, it means that you asked topia - * to make an operation that need a deterministic way to sort the - * result but you didn't defined such query. + * 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. * - * 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". + * 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". * * @since 3.0 */ public class QueryMissingOrderException extends TopiaQueryException { - protected static final String MESSAGE = "given query needs an order by clause since the API call you use need the results sorting to be deterministic"; - private static final long serialVersionUID = 8154110639594660107L; + protected static final String MESSAGE = "Given query needs an ORDER BY clause since the API call you're using " + + "needs the results sorting to be deterministic"; + public QueryMissingOrderException(String hql, Map<String, Object> hqlParameters) { super(MESSAGE, hql, hqlParameters); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContext.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContext.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -32,7 +32,7 @@ import com.google.common.collect.ImmutableMap; /** - * This is the main entry point for ToPIA. This interface represents the root context of an application. + * This is the main entry point for ToPIA. This interface represents the root context of an application. * * Most of the time, there is only one instance of this context during the entire lifecycle of a application. * Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -38,11 +38,11 @@ import com.google.common.collect.Lists; /** - * This class will provide a TopiaApplicationContext cache. Its usage is not necessary, contexts can be directly created - * outside of this cache, then the cache will not contain any reference to the created ApplicationContexts. - * - * This class is 'inspired' from the TopiaContextFactory of ToPIA 2.x + * This class will provide a TopiaApplicationContext cache. Its usage is not necessary, contexts can be directly + * created outside of this cache, then the cache will not contain any reference to the created ApplicationContexts. * + * This class is 'inspired' from the TopiaContextFactory of ToPIA 2.x + * * @author Arnaud Thimel : thimel(a)codelutin.com * @since 3.0 */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaConfigurationConstants.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -27,6 +27,8 @@ import org.hibernate.cfg.Environment; /** + * This class lists the configuration variables that ToPIA expects + * * Created on 12/20/13. * * @author Tony Chemit <chemit(a)codelutin.com> @@ -63,20 +65,16 @@ String CONFIG_URL = Environment.URL; @Deprecated - String CONFIG_PERSISTENCE_DIRECTORIES = - "topia.persistence.directories"; + String CONFIG_PERSISTENCE_DIRECTORIES = "topia.persistence.directories"; - String CONFIG_PERSISTENCE_CLASSES = - "topia.persistence.classes"; + String CONFIG_PERSISTENCE_CLASSES = "topia.persistence.classes"; - String CONFIG_PERSISTENCE_PROPERTIES_FILE = - "topia.persistence.properties.file"; + String CONFIG_PERSISTENCE_PROPERTIES_FILE = "topia.persistence.properties.file"; /** * Configuration directive to change topia Ids generation strategy. * - * Expected value is an fqn to a class which implements - * {@link TopiaIdFactory} + * Expected value is an FQN to a class which implements {@link org.nuiton.topia.persistence.TopiaIdFactory} * * @since 3.0 */ 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 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDao.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -24,17 +24,17 @@ * #L% */ -import com.google.common.base.Optional; +import java.util.List; +import java.util.Map; + import org.nuiton.topia.persistence.event.TopiaEntityListener; import org.nuiton.topia.persistence.event.TopiaEntityVetoable; import org.nuiton.topia.persistence.pager.TopiaPagerBean; -import java.util.List; -import java.util.Map; +import com.google.common.base.Optional; /** - * This contract represents the common operation any DAO should - * be able to provide as API. + * This contract represents the common operations any Dao should be able to provide as API. * * @author bleny * @since 3.0 @@ -75,7 +75,7 @@ /** * Creates a new pager initialized for the first page of all data of the dao. - * + * * Note: This method will execute a count query to init * the pager. * @@ -88,12 +88,12 @@ /** * Creates a new pager initialized for the first page of data of the given * query. - * + * * Note: This method will execute a count query to init * the pager. * - * @param hql query - * @param params params of the query + * @param hql query + * @param params params of the query * @param pageSize size of a page * @return the initialized pager. * @since 3.0 @@ -157,7 +157,7 @@ * Finds all the entities managed by this DAO. * * @return the full list of entities in no particular - * (non-determinisic) order + * (non-determinisic) order */ List<E> findAll(); @@ -236,9 +236,9 @@ * * @param topiaId the identifier of the entity to look for * @return The entity found - * @throws TopiaNoResultException if result is found, if you - * do not want an exception to be raised, use - * {@link #tryFindByTopiaId(String)} + * @throws TopiaNoResultException if result is found, if you + * do not want an exception to be raised, use + * {@link #tryFindByTopiaId(String)} */ E findByTopiaId(String topiaId) throws TopiaNoResultException; @@ -282,8 +282,8 @@ * * @param entity the entity * @return the dictionnary of usages of the given entities (keys are entity - * usage container, values are the list of this type of entity to - * use the given entity). + * usage container, values are the list of this type of entity to + * use the given entity). * @since 2.3.0 */ Map<Class<? extends TopiaEntity>, List<? extends TopiaEntity>> findAllUsages(E entity); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDaoSupplier.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDaoSupplier.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDaoSupplier.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -24,17 +24,17 @@ * #L% */ -import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; - /** + * Contract that provides any Dao instance from a given entity class. + * * @author bleny + * @since 3.0 */ public interface TopiaDaoSupplier { /** - * Get Dao for specified class. If the specialized Dao exists then it is - * returned otherwise a TopiaException will be thrown + * Get Dao for specified class. If the specialized Dao exists then it is returned otherwise a TopiaException will + * be thrown. * * @param entityClass type of entity * @return the expected dao @@ -42,8 +42,8 @@ <E extends TopiaEntity> TopiaDao<E> getDao(Class<E> entityClass); /** - * Get Dao for specified class. If the specialized Dao exists then it is - * returned otherwise a TopiaException will be thrown + * Get Dao for specified class. If the specialized Dao exists then it is returned otherwise a TopiaException will be + * thrown. * * @param entityClass type of entity * @param daoClass the concrete dao class to use Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -30,20 +30,48 @@ import com.google.common.base.Predicates; import com.google.common.collect.Iterables; +/** + * Utility class that provides useful methods for {@link org.nuiton.topia.persistence.TopiaEntity} manipulation. + * + * @author Brendan Le Ny : leny(a)codelutin.com + * @author Arnaud Thimel : thimel(a)codelutin.com + * @since 3.0 + */ public class TopiaEntities { + /** + * Guava's {@link com.google.common.base.Function} to get a topiaId from any + * {@link org.nuiton.topia.persistence.TopiaEntity} + */ protected static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { - @Override public String apply(TopiaEntity input) { return input == null ? null : input.getTopiaId(); } }; + /** + * Creates a Guava's {@link com.google.common.base.Predicate} which tests if a + * {@link org.nuiton.topia.persistence.TopiaEntity} has the given {@code topiaId} + * + * @param id the expected topiaId + * @return the created Predicate + */ protected static Predicate<TopiaEntity> entityHasId(String id) { - return Predicates.compose(Predicates.equalTo(id), GET_TOPIA_ID); + Predicate<String> equalsPredicate = Predicates.equalTo(id); + Predicate<TopiaEntity> result = Predicates.compose(equalsPredicate, GET_TOPIA_ID); + return result; } + /** + * Iterate over the given {@link java.lang.Iterable} looking for a {@link org.nuiton.topia.persistence.TopiaEntity} + * having the given {@code topiaId}. + * + * @param entities the {@link java.lang.Iterable} instance to iterate through + * @param id the expected {@code topiaId} + * @param <E> the type of {@link org.nuiton.topia.persistence.TopiaEntity} of the given Iterable + * @return the found {@link org.nuiton.topia.persistence.TopiaEntity} or null + */ public static <E extends TopiaEntity> E findByTopiaId(Iterable<E> entities, String id) { E result; if (entities == null) { @@ -56,7 +84,7 @@ } /** - * Function to obtain {@link TopiaEntity#getTopiaId()} from any entity. + * Function to obtain {@link org.nuiton.topia.persistence.TopiaEntity#getTopiaId()} from any entity. * * @since 2.6.12 */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -31,15 +31,13 @@ import java.util.List; /** - * The TopiaEntity is the main interface for each entity generated. + * The TopiaEntity is the main interface for each generated entity. + * + * An entity is just a persistent bean mapped with Hibernate. The manipulation on entities (create, update, delete, + * find) is made by the associated {@link org.nuiton.topia.persistence.TopiaDao}. + * + * Setter methods have to be used only in internal. They are in the interface to make easier their usages in internal. * - * An entity is simply a persistent bean mapped with - * Hibernate. The manipulation on entities (create, update, delete, find) is made by the DAO associated. The - * corresponding Dao interface is {@link org.nuiton.topia.persistence.TopiaDao}. - * - * Setter methods have to be used only in internal. They are in the interface to make easier their usages in - * internal. - * * @author poussin <poussin(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> */ @@ -82,62 +80,56 @@ String AGGREGATE = "aggregate"; /** - * Unique technical Id of the entity. This id contains the full qualified - * name of the entity interface. This id has also an index and is used to - * identify uniquely the entity in the database. + * Unique technical Id of the entity. This id contains the fully qualified name of the entity interface. This id + * also has an index and is used to uniquely identify the entity in the database. * * @return the technical Id of the entity */ String getTopiaId(); /** - * Set the technical {@code id} of the entity. Careful, use this method only - * for copy. The technical id is generated by ToPIA when entity is created - * using {@link org.nuiton.topia.persistence.TopiaDao#create()}. + * Set the technical {@code id} of the entity. Make sure to use this method only for copy. The technical id is + * generated by ToPIA when the entity is persisted using the {@link org.nuiton.topia.persistence.TopiaDao#create()} + * methods. * * @param id technical id to set */ void setTopiaId(String id); /** - * Technical property to keep versionning of the entity. The version is - * incremented on each change of the entity. + * Technical property to keep versionning of the entity. The version is incremented on each change of the entity. * * @return the current version of the entity */ long getTopiaVersion(); /** - * Set the technical {@code version} of the entity. Careful, use this method - * only for copy. The version is automatically incremented on entity - * changes. + * Set the technical {@code version} of the entity. Make sure to use this method only for copy. The version is + * automatically incremented on entity changes. * * @param version technical version to set */ void setTopiaVersion(long version); /** - * Technical date creation of the entity. This date doesn't change through - * time and was initialized on entity creation when using {@link - * org.nuiton.topia.persistence.TopiaDao#create()}. + * Technical date creation of the entity. This date doesn't change through time and was initialized on entity + * creation when using the {@link org.nuiton.topia.persistence.TopiaDao#create()} methods. * * @return the creation date of the entity */ Date getTopiaCreateDate(); /** - * Set the technical creation {@code date} of the entity. Careful, use this - * method only for copy. This date is immutable and was created on entity - * creation. + * Set the technical creation {@code date} of the entity. Make sure to use this method only for copy. This date is + * immutable and was created on entity creation. * * @param date technical create date to set */ void setTopiaCreateDate(Date date); /** - * This method must be used to know if the current entity is present on the - * persistent support. If the entity is not yet persisted or if the entity - * has been removed, this method will return false. + * This method must be used to know if the current entity is present on the persistent support. If the entity is not + * yet persisted or if the entity has been removed, this method will return false. * * @return true if the entity is persisted and not yet deleted * @since 3.0 @@ -145,130 +137,183 @@ boolean isPersisted(); /** - * Notifies the current entity instance than it has been removed from the - * persistent support. + * Notifies the current entity instance than it has been removed from the persistent support. * * @since 3.0 */ void notifyDeleted(); /** - * @return all object that must be deleted if this object is deleted - * @throws TopiaException if any pb - * @deprecated from 3.0, method will be moved to entity's generated DAO (cf http://nuiton.org/issues/2776) + * @return all objects that must be deleted if this object is deleted + * @deprecated from 3.0, method will be moved to entity's generated Dao(cf http://nuiton.org/issues/2776) */ @Deprecated - List<TopiaEntity> getComposite() throws TopiaException; + List<TopiaEntity> getComposite(); /** - * @return all object that are aggregate with this instance, aggregate object - * are not removed automatically - * @throws TopiaException if any pb - * @deprecated from 3.0, method will be moved to entity's generated DAO (cf http://nuiton.org/issues/2776) + * @return all objects that are aggregate with this instance, aggregate object are not removed automatically + * @deprecated from 3.0, method will be moved to entity's generated Dao (cf http://nuiton.org/issues/2776) */ @Deprecated - List<TopiaEntity> getAggregate() throws TopiaException; + List<TopiaEntity> getAggregate(); /** * Route the entity using a {@code visitor}. * * @param visitor to used - * @throws TopiaException for all type of error */ - void accept(EntityVisitor visitor) throws TopiaException; + void accept(TopiaEntityVisitor visitor); //------------------------------------------------------------------------// //-- PropertyListener (read) methods -------------------------------------// //------------------------------------------------------------------------// /** - * Add listener for property reading. + * Adds a {@link java.beans.PropertyChangeListener} on any property reading. * * @param listener the listener to register + * @see java.beans.PropertyChangeSupport */ - // TODO AThimel 20/07/13 Javadoc void addPropertyListener(PropertyChangeListener listener); /** - * Add listener for property reading. + * Adds a {@link java.beans.PropertyChangeListener} on the given property reading. * * @param propertyName the property name to listen * @param listener the listener to register + * @see java.beans.PropertyChangeSupport */ - // TODO AThimel 20/07/13 Javadoc - void addPropertyListener(String propertyName, - PropertyChangeListener listener); + void addPropertyListener(String propertyName, PropertyChangeListener listener); - // TODO AThimel 20/07/13 Javadoc + /** + * Remove the given {@link java.beans.PropertyChangeListener} registered for any property reading. + * + * @param listener the listener to unregister + * @see java.beans.PropertyChangeSupport + */ void removePropertyListener(PropertyChangeListener listener); - // TODO AThimel 20/07/13 Javadoc - void removePropertyListener(String propertyName, - PropertyChangeListener listener); + /** + * Remove the given {@link java.beans.PropertyChangeListener} registered the given property reading. + * + * @param propertyName the property name to unregister reading + * @param listener the listener to unregister + * @see java.beans.PropertyChangeSupport + */ + void removePropertyListener(String propertyName, PropertyChangeListener listener); //------------------------------------------------------------------------// //-- PropertyChangeListener (write) methods ------------------------------// //------------------------------------------------------------------------// /** - * Add listener for property writing. + * Adds a {@link java.beans.PropertyChangeListener} on any property writing. * * @param listener the listener to register + * @see java.beans.PropertyChangeSupport */ - // TODO AThimel 20/07/13 Javadoc void addPropertyChangeListener(PropertyChangeListener listener); /** - * Add listener for property writing. + * Adds a {@link java.beans.PropertyChangeListener} on the given property writing. * - * @param propertyName name of property to listen + * @param propertyName the property name to listen * @param listener the listener to register + * @see java.beans.PropertyChangeSupport */ - // TODO AThimel 20/07/13 Javadoc - void addPropertyChangeListener(String propertyName, - PropertyChangeListener listener); + void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); - // TODO AThimel 20/07/13 Javadoc + /** + * Remove the given {@link java.beans.PropertyChangeListener} registered for any property writing. + * + * @param listener the listener to unregister + * @see java.beans.PropertyChangeSupport + */ void removePropertyChangeListener(PropertyChangeListener listener); - // TODO AThimel 20/07/13 Javadoc - void removePropertyChangeListener(String propertyName, - PropertyChangeListener listener); + /** + * Remove the given {@link java.beans.PropertyChangeListener} registered the given property writing. + * + * @param propertyName the property name to unregister writing + * @param listener the listener to unregister + * @see java.beans.PropertyChangeSupport + */ + void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); //------------------------------------------------------------------------// //-- VetoableListener (read) methods -------------------------------------// //------------------------------------------------------------------------// - // TODO AThimel 20/07/13 Javadoc + /** + * Adds a {@link java.beans.VetoableChangeListener} on any property reading. + * + * @param vetoable the listener to register + * @see java.beans.VetoableChangeSupport + */ void addVetoableListener(VetoableChangeListener vetoable); - // TODO AThimel 20/07/13 Javadoc - void addVetoableListener(String propertyName, - VetoableChangeListener vetoable); + /** + * Adds a {@link java.beans.VetoableChangeListener} on the given property reading. + * + * @param propertyName the property name to listen + * @param vetoable the listener to register + * @see java.beans.VetoableChangeSupport + */ + void addVetoableListener(String propertyName, VetoableChangeListener vetoable); - // TODO AThimel 20/07/13 Javadoc + /** + * Remove the given {@link java.beans.VetoableChangeListener} registered for any property reading. + * + * @param vetoable the listener to unregister + * @see java.beans.VetoableChangeSupport + */ void removeVetoableListener(VetoableChangeListener vetoable); - // TODO AThimel 20/07/13 Javadoc - void removeVetoableListener(String propertyName, - VetoableChangeListener vetoable); + /** + * Remove the given {@link java.beans.VetoableChangeListener} registered the given property reading. + * + * @param propertyName the property name to unregister reading + * @param vetoable the listener to unregister + * @see java.beans.VetoableChangeSupport + */ + void removeVetoableListener(String propertyName, VetoableChangeListener vetoable); //------------------------------------------------------------------------// //-- VetoableChangeListener (write) methods ------------------------------// //------------------------------------------------------------------------// - // TODO AThimel 20/07/13 Javadoc + /** + * Adds a {@link java.beans.VetoableChangeListener} on any property writing. + * + * @param vetoable the listener to register + * @see java.beans.VetoableChangeSupport + */ void addVetoableChangeListener(VetoableChangeListener vetoable); - // TODO AThimel 20/07/13 Javadoc - void addVetoableChangeListener(String propertyName, - VetoableChangeListener vetoable); + /** + * Adds a {@link java.beans.VetoableChangeListener} on the given property writing. + * + * @param propertyName the property name to listen + * @param vetoable the listener to register + * @see java.beans.VetoableChangeSupport + */ + void addVetoableChangeListener(String propertyName, VetoableChangeListener vetoable); - // TODO AThimel 20/07/13 Javadoc + /** + * Remove the given {@link java.beans.VetoableChangeListener} registered for any property writing. + * + * @param vetoable the listener to unregister + * @see java.beans.VetoableChangeSupport + */ void removeVetoableChangeListener(VetoableChangeListener vetoable); - // TODO AThimel 20/07/13 Javadoc - void removeVetoableChangeListener(String propertyName, - VetoableChangeListener vetoable); + /** + * Remove the given {@link java.beans.VetoableChangeListener} registered the given property writing. + * + * @param propertyName the property name to unregister writing + * @param vetoable the listener to unregister + * @see java.beans.VetoableChangeSupport + */ + void removeVetoableChangeListener(String propertyName, VetoableChangeListener vetoable); -} //TopiaEntity +} Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -27,6 +27,8 @@ /** * {@link TopiaEntity} with {@link org.nuiton.topia.persistence.TopiaDaoSupplier} support (injected by * {@link org.nuiton.topia.persistence.internal.AbstractTopiaDao} into entities). + * + * WARNING, it is not recommended to use this mechanism as it breaks the POJO's Hibernate approach. * * @author chatellier */ @@ -42,8 +44,17 @@ */ void delete(); - void setTopiaDAOSupplier(TopiaDaoSupplier topiaDAO); + /** + * Injects into this entity the given {@link org.nuiton.topia.persistence.TopiaDaoSupplier}, which can be used to + * get any Dao instance. This is used to make {@link #update()} and {@link #delete()} implementation possible. + * + * @param topiaDaoSupplier an initialized {@link org.nuiton.topia.persistence.TopiaDaoSupplier} instance + */ + void setTopiaDaoSupplier(TopiaDaoSupplier topiaDaoSupplier); - TopiaDaoSupplier getTopiaDAOSupplier(); + /** + * @return the currently injected {@link org.nuiton.topia.persistence.TopiaDaoSupplier} + */ + TopiaDaoSupplier getTopiaDaoSupplier(); } Copied: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityVisitor.java (from rev 2981, trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/EntityVisitor.java) =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityVisitor.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityVisitor.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -0,0 +1,112 @@ +package org.nuiton.topia.persistence; + +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * 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 + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +/** + * Visitor contract for any {@link TopiaEntity}. + * + * Created: 28 janv. 2009 18:10:34 + * + * @author bpoussin <poussin(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + */ +public interface TopiaEntityVisitor { + + /** + * Start the visit of the given entity. + * + * @param entity the visited entity + */ + void start(TopiaEntity entity); + + /** + * Ends the visit of the given entity. + * + * @param entity the visited entity + */ + void end(TopiaEntity entity); + + /** + * Visit a none indexed property for the given entity. + * + * The property visited is defined by the other parameters. + * + * @param entity the visited entity + * @param propertyName the name of the visited property + * @param type the type of the visited property + * @param value the value of the visited property + */ + void visit(TopiaEntity entity, + String propertyName, + Class<?> type, + Object value); + + /** + * Visit a collection property for the given entity. + * + * The property visited is defined by the other parameters. + * + * @param entity the visited entity + * @param propertyName the name of the visited property + * @param collectionType the type of the visited collection + * @param type the type of the visited property + * @param value the value of the visited property + */ + void visit(TopiaEntity entity, + String propertyName, + Class<?> collectionType, + Class<?> type, + Object value); + + /** + * Visit a indexed value from a collection property for the given entity. + * + * The property visited is defined by the other parameters. + * + * @param entity the visited entity + * @param propertyName the name of the visited property + * @param collectionType the type of the container of the visited property + * @param type the type of the visited property + * @param index the index of the visited property in his container + * @param value the value of the visited property + */ + void visit(TopiaEntity entity, + String propertyName, + Class<?> collectionType, + Class<?> type, + int index, + Object value); + + /** + * Reset all states of the visitor. + * + * If you use internal states inside the visitor, this method should clean + * all of them. + * + * This method should be invoked after usage of the visitor. + */ + void clear(); + +} 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 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaException.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -34,7 +34,6 @@ */ public class TopiaException extends RuntimeException { - /** Version UID */ private static final long serialVersionUID = -1251439453383121393L; /** Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaIdFactory.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -25,9 +25,13 @@ */ /** - * This API represents an ID generation strategy + * This contract represents a topiaId generation strategy. * - * // TODO AThimel 20/07/13 Javadoc (finish this javadoc) + * It can be used in both ways : + * <ul> + * <li>generate a new topiaId from a given class;</li> + * <li>retrieves a class or random part from a given topiaId.</li> + * </ul> * * @author bleny <leny(a)codelutin.com/> * @author tchemit <chemit(a)codelutin.com/> @@ -36,30 +40,31 @@ public interface TopiaIdFactory { /** - * Generates a new topia id for the given entity type and the given entity. + * Generates a new topiaId for the given entity type and the given entity. * * @param entityClass type of entity (must be a not null interface) * @param topiaEntity the entity on which we want to generate the id (must be not null) * @param <E> type of entity - * @return the new topia id for the given entity + * @return the new topiaId for the given entity */ <E extends TopiaEntity> String newTopiaId(Class<E> entityClass, TopiaEntity topiaEntity); /** - * @param topiaId the topia id to inspect + * @param topiaId the topiaId to inspect * @param <E> type of the entity - * @return the fqn part of the topia id + * @return the FQN part of the topiaId */ <E extends TopiaEntity> Class<E> getClassName(String topiaId); /** - * @param topiaId the topia id to inspect - * @return the random poart of the topia id. + * @param topiaId the topiaId to inspect + * @return the random part of the topiaId. */ String getRandomPart(String topiaId); /** - * @return the separator between the fqn and the random part of any topia id. + * @return the separator between the FQN and the random part of any topiaId. */ String getSeparator(); + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceContext.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceContext.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaPersistenceContext.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -80,9 +80,8 @@ * * @param entities the entities to delete */ - <E extends TopiaEntity> void deleteAll(Iterable<E> entities); + <E extends TopiaEntity> void deleteAll(Iterable<E> entities); - /** * Get the currently configured {@link TopiaIdFactory}. * 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 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransaction.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -25,7 +25,7 @@ */ /** - * This API provides methods to manipulate transaction + * This contract provides methods to manipulate transaction * * @author Arnaud Thimel : thimel(a)codelutin.com * @since 3.0 @@ -33,15 +33,20 @@ public interface TopiaTransaction { /** - * Applies all the modifications made to this context on the persistence - * device. Once commit is done, a new transaction is started. + * Applies all the modifications made to this context on the persistence device. + * + * Once commit is done, a new internal transaction is started, but you do not have to get a new instance of + * {@link TopiaTransaction}. */ void commit(); /** - * Cancels all the modifications made to this context, coming back to the - * state on the last beginTransaction. Once rollback is done, a new - * transaction is started. + * Cancels all the modifications made to this context, coming back to the state when this transaction has been + * created (using {@link TopiaApplicationContext#newPersistenceContext()}) or previously rollbacked (using the + * current method). + * + * Once rollback is done, a new internal transaction is started, but you do not have to get a new instance of + * {@link TopiaTransaction}. */ void rollback(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaTransactionAware.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -34,6 +34,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 2.6.1 + * @deprecated This is probably not useful anymore. */ public interface TopiaTransactionAware { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -228,7 +228,7 @@ if (entity instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable) entity; - contextable.setTopiaDAOSupplier(this.topiaDaoSupplier); + contextable.setTopiaDaoSupplier(this.topiaDaoSupplier); } // save entity Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaEntity.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -58,15 +58,39 @@ transient protected TopiaFiresSupport fireSupport; + transient protected PropertyChangeSupport readListeners; + + transient protected PropertyChangeSupport writeListeners; + transient protected VetoableChangeSupport readVetoables; - transient protected PropertyChangeSupport readListeners; - transient protected VetoableChangeSupport writeVetoables; - transient protected PropertyChangeSupport writeListeners; + /** + * 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 #writeListeners} at first use or after deserialisation. + * + * @return writeListeners + */ + protected PropertyChangeSupport getWritePropertyChangeSupport() { + if (writeListeners == null) { + writeListeners = new PropertyChangeSupport(this); + } + return writeListeners; + } + + /** * Initialize {@link #readVetoables} at first use or after deserialisation. * * @return readVetoables @@ -79,18 +103,6 @@ } /** - * 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 @@ -102,18 +114,6 @@ 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; @@ -208,7 +208,7 @@ if (fireSupport == null) { if (this instanceof TopiaEntityContextable) { TopiaEntityContextable contextable = (TopiaEntityContextable) this; - AbstractTopiaDao topiaDAO = (AbstractTopiaDao)contextable.getTopiaDAOSupplier().getDao(getClass()); + AbstractTopiaDao topiaDAO = (AbstractTopiaDao)contextable.getTopiaDaoSupplier().getDao(getClass()); fireSupport = topiaDAO.getTopiaFiresSupport(); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/DefaultTopiaIdFactory.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -24,16 +24,15 @@ * #L% */ +import java.util.UUID; + import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaIdFactory; -import java.util.UUID; - /** - * Default implementation of {@link TopiaIdFactory}. Generates an FQN followed - * by an random UUID. + * Default implementation of {@link TopiaIdFactory}. Generates a FQN followed by a random UUID. * * @author Brendan Le Ny <leny(a)codelutin.com> * @since 3.0 @@ -52,7 +51,6 @@ @Override public <E extends TopiaEntity> Class<E> getClassName(String topiaId) { -// String className = Iterables.get(Splitter.on(getSeparator()).split(topiaId), 0); String className = StringUtils.substringBefore(topiaId, getSeparator()); try { Class<E> entityClass = (Class<E>) Class.forName(className); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/support/TopiaHibernateEventListener.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -91,9 +91,9 @@ TopiaDaoSupplier daoSupplier) { if (entity instanceof TopiaEntityContextable) { TopiaEntityContextable topiaEntityContextable = (TopiaEntityContextable) entity; - if (topiaEntityContextable.getTopiaDAOSupplier() == null) { + if (topiaEntityContextable.getTopiaDaoSupplier() == null) { try { - topiaEntityContextable.setTopiaDAOSupplier(daoSupplier); + topiaEntityContextable.setTopiaDaoSupplier(daoSupplier); } catch (TopiaException eee) { if (log.isWarnEnabled()) { log.warn("Impossible d'initialiser le TopiaContext" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/package-info.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -23,7 +23,7 @@ */ /** - * This package contains most of the needed contracts when using ToPIA. + * This package contains most of the needed contracts when using ToPIA. * * To manipulate ToPIA you need to understand the role of both interfaces * {@link org.nuiton.topia.persistence.TopiaApplicationContext} and Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/DefaultTopiaIdFactoryTest.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -39,7 +39,7 @@ class EntityAImpl extends AbstractTopiaEntity implements EntityA { @Override - public void accept(EntityVisitor visitor) throws TopiaException { + public void accept(TopiaEntityVisitor visitor) throws TopiaException { } } @@ -49,7 +49,7 @@ class EntityBImpl extends AbstractTopiaEntity implements EntityB { @Override - public void accept(EntityVisitor visitor) throws TopiaException { + public void accept(TopiaEntityVisitor visitor) throws TopiaException { } } Modified: trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java =================================================================== --- trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -28,8 +28,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntityVisitor; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.TopiaPersistenceHelper; @@ -46,7 +46,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.6.12 */ -public class ExportEntityVisitor<T extends TopiaEntityEnum> implements EntityVisitor, Closeable { +public class ExportEntityVisitor<T extends TopiaEntityEnum> implements TopiaEntityVisitor, Closeable { /** Logger. */ private static final Log log = LogFactory.getLog(ExportEntityVisitor.class); Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -615,10 +615,6 @@ /** * Generate hibernate xml attribute with a final space. - * @param attributeName - * @param tagValue - * @param defaultValue - * @return */ private String generateFromTagValue(String attributeName, String tagValue, String defaultValue) { String result = ""; Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -39,10 +39,10 @@ import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.topia.persistence.TopiaEntityVisitor; import org.nuiton.topia.persistence.internal.AbstractTopiaEntity; import org.nuiton.topia.persistence.TopiaDaoSupplier; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.util.TopiaEntityHelper; @@ -352,7 +352,7 @@ "instance. For internal usage only"); ObjectModelOperation op = addOperation(outputAbstract, - "getTopiaDAOSupplier", TopiaDaoSupplier.class, + "getTopiaDaoSupplier", TopiaDaoSupplier.class, ObjectModelJavaModifier.PUBLIC); setDocumentation(op,"@since 3.0"); addAnnotation(outputAbstract, op, Override.class); @@ -363,7 +363,7 @@ ); op = addOperation(outputAbstract, - "setTopiaDAOSupplier", "void", + "setTopiaDaoSupplier", "void", ObjectModelJavaModifier.PUBLIC); addException(op, TopiaException.class); addParameter(op, TopiaDaoSupplier.class, "topiaDaoSupplier"); @@ -389,7 +389,7 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - getTopiaDAOSupplier().getDao(<%=input.getName()%>.class).update(this); + getTopiaDaoSupplier().getDao(<%=input.getName()%>.class).update(this); }*/ ); @@ -399,7 +399,7 @@ addAnnotation(outputAbstract, op, Override.class); setOperationBody(op, "" /*{ - getTopiaDAOSupplier().getDao(<%=input.getName()%>.class).delete(this); + getTopiaDaoSupplier().getDao(<%=input.getName()%>.class).delete(this); }*/ ); } @@ -1293,7 +1293,7 @@ acceptOperation = addOperation(outputAbstract, "accept", void.class); addAnnotation(outputAbstract, acceptOperation , Override.class); ObjectModelParameter param = - addParameter(acceptOperation, EntityVisitor.class, "visitor"); + addParameter(acceptOperation, TopiaEntityVisitor.class, "visitor"); addException(acceptOperation, TopiaException.class); Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java 2014-01-17 17:38:55 UTC (rev 2981) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTagValues.java 2014-01-17 22:38:39 UTC (rev 2982) @@ -30,12 +30,7 @@ import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; -import org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext; -import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaDaoSupplier; -import org.nuiton.topia.persistence.internal.AbstractTopiaDao; -import org.nuiton.topia.persistence.TopiaDao; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; import static org.nuiton.eugene.ModelPropertiesUtil.TagValueDefinition; @@ -56,7 +51,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "") + documentation = "") String TAG_PERSISTENCE_TYPE = "persistenceType"; /** @@ -77,7 +72,7 @@ * @see TopiaGeneratorUtil#getReverseDbName(ObjectModelAttribute) */ @TagValueDefinition(target = {ObjectModelElement.class}, - documentation = "Sets the database name of an element of the model (a table or a column)") + documentation = "Sets the database name of an element of the model (a table or a column)") String TAG_DB_NAME = "dbName"; /** @@ -88,7 +83,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class, ObjectModelAttribute.class}, - documentation = "Sets the database schema name") + documentation = "Sets the database schema name") String TAG_SCHEMA_NAME = "dbSchema"; /** @@ -98,7 +93,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the length of an attribute in database") + documentation = "Sets the length of an attribute in database") String TAG_LENGTH = "length"; /** @@ -108,7 +103,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets an annotation of an attribute") + documentation = "Sets an annotation of an attribute") String TAG_ANNOTATION = "annotation"; /** @@ -118,7 +113,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the access type of an attribute (Hibernate mapping)") + documentation = "Sets the access type of an attribute (Hibernate mapping)") String TAG_ACCESS = "access"; /** @@ -129,7 +124,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets an attribute as part of a natural id (Hibernate Mapping)") + documentation = "Sets an attribute as part of a natural id (Hibernate Mapping)") String TAG_NATURAL_ID = "naturalId"; /** @@ -140,7 +135,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelClassifier.class}, - documentation = "Sets if natural id of a entity is mutable (hibernate mapping)") + documentation = "Sets if natural id of a entity is mutable (hibernate mapping)") String TAG_NATURAL_ID_MUTABLE = "naturalIdMutable"; /** @@ -154,7 +149,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets which part of a N-N relation is master (inverse=true) and slave (inverse=false) (must be put on each side on a such relation) (Hibernate mapping)") + documentation = "Sets which part of a N-N relation is master (inverse=true) and slave (inverse=false) (must be put on each side on a such relation) (Hibernate mapping)") String TAG_INVERSE = "inverse"; /** @@ -164,7 +159,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets if an association should be lazy (Hibernate mapping)") + documentation = "Sets if an association should be lazy (Hibernate mapping)") String TAG_LAZY = "lazy"; /** @@ -174,7 +169,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the fetch caracteristic of an attribute (Hibernate mapping)") + documentation = "Sets the fetch caracteristic of an attribute (Hibernate mapping)") String TAG_FETCH = "fetch"; /** @@ -184,7 +179,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the order by propertie of an multiple association (Hibernate mapping)") + documentation = "Sets the order by propertie of an multiple association (Hibernate mapping)") String TAG_ORDER_BY = "orderBy"; /** @@ -194,7 +189,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets if an attribute must be not null (Hibernate mapping)") + documentation = "Sets if an attribute must be not null (Hibernate mapping)") String TAG_NOT_NULL = "notNull"; /** @@ -204,7 +199,7 @@ * base */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "'true' if the value of this attribute of type Enumeration should be stored with its name (instead of using ordinal)") + documentation = "'true' if the value of this attribute of type Enumeration should be stored with its name (instead of using ordinal)") String TAG_USE_ENUMERATION_NAME = "useEnumerationName"; /** @@ -219,7 +214,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "Configure the proxy interface on something else than the default implementation (null to use our default implementation, none to let hibernate deal it) (Hibernate mapping)") + documentation = "Configure the proxy interface on something else than the default implementation (null to use our default implementation, none to let hibernate deal it) (Hibernate mapping)") String TAG_PROXY_INTERFACE = "hibernateProxyInterface"; /** @@ -234,7 +229,7 @@ * @since 3.0 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "Configure the proxy interface on something else than the default implementation (null to use our default implementation, none to let hibernate deal it) (Hibernate mapping)") + documentation = "Configure the proxy interface on something else than the default implementation (null to use our default implementation, none to let hibernate deal it) (Hibernate mapping)") String TAG_INHERITANCE_STRATEGY = "inheritanceStrategy"; /** @@ -245,7 +240,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "To not generate the toString method on entities") + documentation = "To not generate the toString method on entities") String TAG_NOT_GENERATE_TO_STRING = "notGenerateToString"; /** @@ -256,7 +251,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "To sort attribute while generation") + documentation = "To sort attribute while generation") String TAG_SORT_ATTRIBUTE = "sortAttribute"; /** @@ -267,7 +262,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class}, - documentation = "To generate EntityOperation on generated DAOHelper") + documentation = "To generate EntityOperation on generated DAOHelper") String TAG_GENERATE_OPERATOR_FOR_DAO_HELPER = "generateOperatorForDAOHelper"; /** @@ -277,7 +272,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the hibernate type of an attribute (Hibernate mapping)") + documentation = "Sets the hibernate type of an attribute (Hibernate mapping)") String TAG_TYPE = "type"; /** @@ -287,7 +282,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModelAttribute.class}, - documentation = "Sets the sql type of an attribute (Hibernate mapping)") + documentation = "Sets the sql type of an attribute (Hibernate mapping)") String TAG_SQL_TYPE = "sqlType"; /** @@ -301,7 +296,7 @@ * @since 2.5 */ @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Sets the fully qualified name of the DAO implementation to use in generated DAO (default is DAOImpl (base on TopiaQuery))") + documentation = "Sets the fully qualified name of the DAO implementation to use in generated DAO (default is DAOImpl (base on TopiaQuery))") String TAG_DAO_IMPLEMENTATION = "daoImplementation"; /** @@ -311,7 +306,7 @@ * @since 2.6.5 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelAttribute.class}, - documentation = "Specifies if an nm-multiplicity attribute (or all nm-multiplicity attributes of a given model) needs an index in db (Hibernate mapping)") + documentation = "Specifies if an nm-multiplicity attribute (or all nm-multiplicity attributes of a given model) needs an index in db (Hibernate mapping)") String TAG_INDEX_FOREIGN_KEYS = "indexForeignKeys"; /** @@ -324,59 +319,63 @@ * @since 2.6.7 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, - documentation = "Add a \"id\" property with its getter/setter on a DTO.") + documentation = "Add a \"id\" property with its getter/setter on a DTO.") String TAG_GENERATE_TOPIA_ID_IN_DTO = "generateDTOTopiaId"; /** - * Tag to specify a super class to use instead of {@link AbstractTopiaPersistenceContext}. + * Tag to specify a super class to use instead of + * {@link org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext}. * - * Note: the class must implements {@link AbstractTopiaPersistenceContext}. + * Note: the class must implements + * {@link org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext}. * - * @see AbstractTopiaPersistenceContext - * @see TopiaGeneratorUtil#getPersistenceContextSuperClassTagValue(ObjectModel)} + * @see org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext + * @see TopiaGeneratorUtil#getPersistenceContextSuperClassTagValue(org.nuiton.eugene.models.object.ObjectModel) * @since 3.0 */ @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Change the super class to use when generating PersistenceContext.") + documentation = "Change the super class to use when generating PersistenceContext.") String TAG_PERSISTENCE_CONTEXT_SUPER_CLASS = "persistenceContextSuperClass"; /** - * Tag to specify a super class to use instead of {@link AbstractTopiaApplicationContext}. + * Tag to specify a super class to use instead of + * {@link org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext}. * - * Note: the class must implements {@link AbstractTopiaApplicationContext}. + * Note: the class must implement + * {@link org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext}. * - * @see AbstractTopiaApplicationContext - * @see TopiaGeneratorUtil#getApplicationContextSuperClassTagValue(ObjectModel)} + * @see org.nuiton.topia.persistence.internal.AbstractTopiaApplicationContext + * @see TopiaGeneratorUtil#getApplicationContextSuperClassTagValue(org.nuiton.eugene.models.object.ObjectModel) * @since 3.0 */ @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Change the super class to use when generating ApplicationContext.") + documentation = "Change the super class to use when generating ApplicationContext.") String TAG_APPLICATION_CONTEXT_SUPER_CLASS = "applicationContextSuperClass"; /** - * Tag to specify a super class to use instead of {@link AbstractTopiaDao}. + * Tag to specify a super class to use instead of {@link org.nuiton.topia.persistence.internal.AbstractTopiaDao}. * - * Note: the class must implements {@link TopiaDao}. + * Note: the class must implements {@link org.nuiton.topia.persistence.TopiaDao}. * - * @see AbstractTopiaDao - * @see TopiaGeneratorUtil#getDaoSuperClassTagValue(ObjectModelClassifier, ObjectModel)} + * @see org.nuiton.topia.persistence.internal.AbstractTopiaDao + * @see TopiaGeneratorUtil#getDaoSuperClassTagValue(org.nuiton.eugene.models.object.ObjectModelClassifier, org.nuiton.eugene.models.object.ObjectModel) * @since 3.0 */ @TagValueDefinition(target = {ObjectModelClassifier.class, ObjectModel.class}, - documentation = "Change the super class to use when generating dao.") - String TAG_DAO_SUPER_CLASS= "daoSuperClass"; + documentation = "Change the super class to use when generating dao.") + String TAG_DAO_SUPER_CLASS = "daoSuperClass"; /** * Tag to specify a super class to use instead of {@link org.nuiton.topia.persistence.internal.AbstractTopiaEntity}. * - * Note: the class must implements {@link TopiaEntity}. + * Note: the class must implements {@link org.nuiton.topia.persistence.TopiaEntity}. * - * @see TopiaEntity - * @see TopiaGeneratorUtil#getEntitySuperClassTagValue(ObjectModelClassifier, ObjectModel)} + * @see org.nuiton.topia.persistence.TopiaEntity + * @see TopiaGeneratorUtil#getEntitySuperClassTagValue(org.nuiton.eugene.models.object.ObjectModelClassifier, org.nuiton.eugene.models.object.ObjectModel) * @since 3.0 */ @TagValueDefinition(target = {ObjectModelClassifier.class, ObjectModel.class}, - documentation = "Change the super class to use when generating Entity.") - String TAG_ENTITY_SUPER_CLASS= "entitySuperClass"; + documentation = "Change the super class to use when generating Entity.") + String TAG_ENTITY_SUPER_CLASS = "entitySuperClass"; }

1 0