[topia] branch develop updated (d3a0534 -> b7a1593)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from d3a0534 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ed5bca0 fixes #3453: Non compilabel code generated when using custom type with generics new b7a1593 Merge branch 'develop' of https://git.nuiton.org/topia into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b7a1593e40f0c0856b1e71b9556649181f217a44 Merge: ed5bca0 d3a0534 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 20 19:25:02 2014 +0200 Merge branch 'develop' of https://git.nuiton.org/topia into develop commit ed5bca00b9abca680820e8c380eb2b9c6435b83d Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 20 19:22:07 2014 +0200 fixes #3453: Non compilabel code generated when using custom type with generics Summary of changes: .../src/main/java/org/nuiton/topia/templates/EntityTransformer.java | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit ed5bca00b9abca680820e8c380eb2b9c6435b83d Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 20 19:22:07 2014 +0200 fixes #3453: Non compilabel code generated when using custom type with generics --- .../src/main/java/org/nuiton/topia/templates/EntityTransformer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java index 48d3f7c..347c244 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java @@ -1732,6 +1732,8 @@ public class EntityTransformer extends ObjectModelTransformerToJava { GeneratorUtil.getSimpleName(getPropertyName(attribute)); String attrType = GeneratorUtil.getSimpleName(getPropertyType(attribute)); + // remove custom generics http://nuiton.org/issues/3453 + attrType = GeneratorUtil.removeAnyGenericDefinition(attrType); String collectionType = getCollectionType(attribute); String constantName = getConstantName(attrName); if (collectionType != null) { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit b7a1593e40f0c0856b1e71b9556649181f217a44 Merge: ed5bca0 d3a0534 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Aug 20 19:25:02 2014 +0200 Merge branch 'develop' of https://git.nuiton.org/topia into develop pom.xml | 6 +- topia-it/pom.xml | 6 + .../topia/it/legacy/topiatest/CompanyTopiaDao.java | 44 +++ topia-it/src/main/xmi/topia-it-legacy.zargo | Bin 25924 -> 25927 bytes .../nuiton/topia/it/legacy/AbstractLegacyTest.java | 38 +- .../topia/it/legacy/TopiaJpaSupportTest.java | 10 +- .../it/legacy/evo3396/FetchPropertiesTest.java | 393 +++++++++++++++++++++ .../framework/TopiaContextReplicateTest.java | 8 +- .../topia/it/legacy/generator/TopiaTestCase.java | 2 +- .../persistence/EntityVisitorExportXmlTest.java | 2 +- .../topia/it/legacy/persistence/NaturalIdTest.java | 6 +- .../nuiton/topia/it/legacy/topiatest/EnumTest.java | 6 +- .../test1/BiDirectionalOneToManyRelationTest.java | 4 +- ...ectionalOneToManyRelationWithRoleNamedTest.java | 4 +- .../mapping/test1/SimpleOneToManyRelationTest.java | 4 +- .../SimpleOneToManyRelationWithRoleNamedTest.java | 4 +- .../test11/EntityWithBasicUniqueFieldsTest.java | 6 +- .../mapping/test11/SimpleManyToManyUniqueTest.java | 2 +- .../SimpleManyToManyWithRoleNamedUniqueTest.java | 2 +- .../mapping/test11/SimpleOneToManyUniqueTest.java | 2 +- .../SimpleOneToManyWithRoleNamedUniqueTest.java | 2 +- .../test12/EntityWithBasicNotNullFieldsTest.java | 2 +- .../it/mapping/test13/EntityWithNaturalIdTest.java | 4 +- .../mapping/test14/BidiAssociationClassTest.java | 8 +- .../test14/ManyToManyAssociationClassTest.java | 2 +- .../test14/OneToManyAssociationClassTest.java | 6 +- .../test2/BiDirectionalManyToOneRelationTest.java | 4 +- ...ectionalManyToOneRelationWithRoleNamedTest.java | 4 +- .../mapping/test2/SimpleManyToOneRelationTest.java | 4 +- .../SimpleManyToOneRelationWithRoleNamedTest.java | 4 +- .../test3/BiDirectionalManyToManyRelationTest.java | 4 +- ...ctionalManyToManyRelationWithRoleNamedTest.java | 4 +- .../test3/SimpleManyToManyRelationTest.java | 4 +- .../SimpleManyToManyRelationWithRoleNamedTest.java | 4 +- .../it/mapping/test4/ElementCollectionTest.java | 2 +- .../BiDirectionalOneToManyCompositionTest.java | 4 +- .../it/mapping/test5/OneToManyCompositionTest.java | 4 +- .../mapping/test6/SimpleOneToManyIndexedTest.java | 6 +- .../SimpleOneToManyWithRoleNamedIndexedTest.java | 6 +- .../mapping/test7/SimpleOneToManyOrderByTest.java | 6 +- .../mapping/test7/SimpleOneToManyOrderedTest.java | 6 +- .../persistence/internal/EntityListenerTest.java | 2 +- .../topia/persistence/internal/TopiaDaoTest.java | 4 +- .../topia/persistence/HqlAndParametersBuilder.java | 118 ++++++- .../org/nuiton/topia/persistence/TopiaDao.java | 8 +- ...nceHelper.java => TopiaEntityEnumProvider.java} | 11 +- .../TopiaQueryBuilderAddCriteriaStep.java | 13 + .../persistence/event/TopiaTransactionEvent.java | 2 +- .../persistence/internal/AbstractTopiaDao.java | 182 ++++++++-- .../internal/AbstractTopiaPersistenceContext.java | 65 ++-- .../persistence/internal/LegacyTopiaIdFactory.java | 2 +- .../internal/support/HibernateTopiaJpaSupport.java | 40 ++- .../internal/support/TopiaFiresSupport.java | 14 +- .../support/TopiaHibernateEventListener.java | 20 +- .../nuiton/topia/persistence/legacy/Collector.java | 2 +- .../nuiton/topia/persistence/legacy/DBMapping.java | 2 +- .../nuiton/topia/persistence/metadata/DbMeta.java | 10 +- .../topia/persistence/metadata/TableMeta.java | 6 +- .../topia/persistence/util/EntityOperator.java | 6 +- .../persistence/util/EntityOperatorStore.java | 2 +- .../topia/persistence/util/TopiaEntityHelper.java | 2 +- .../topia/service/csv/out/ExportEntityVisitor.java | 8 +- .../TopiaServiceFlywayInitOnCreateSchemaTest.java | 2 + .../migration/AbstractTopiaMigrationCallback.java | 2 +- .../migration/TopiaMigrationCallbackByClass.java | 2 +- .../migration/TopiaMigrationCallbackByClassNG.java | 6 +- .../migration/TopiaMigrationCallbackByMethod.java | 2 +- .../topia/migration/TopiaMigrationEngine.java | 49 ++- .../topia/migration/mappings/TMSVersion.java | 6 +- .../topia/migration/mappings/TMSVersionDAO.java | 16 +- .../migration/mappings/TMSVersionHibernateDao.java | 6 +- .../TestMigrationCallbackAddB71NameColumn.java | 7 +- .../TestMigrationCallbackCreateWhateverTable.java | 7 +- .../migration/TestMigrationCallbackDoNothing.java | 5 +- .../topia/replication/TopiaReplicationContext.java | 2 +- .../topia/replication/operation/Duplicate.java | 2 +- .../AbstractTopiaReplicationServiceTest.java | 4 +- .../templates/ApplicationContextTransformer.java | 15 + .../topia/templates/EntityDaoTransformer.java | 13 +- .../topia/templates/EntityEnumTransformer.java | 31 +- .../templates/PersistenceContextTransformer.java | 1 - 81 files changed, 1031 insertions(+), 305 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm