branch develop updated (6f5e5d3 -> c4b9beb)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git from 6f5e5d3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c4b9beb fixes #650: Update to hibernate 5.1.5 The 1 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 c4b9beb531094a0ff3269e079bd68cd68688612a Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Apr 14 11:39:57 2017 +0200 fixes #650: Update to hibernate 5.1.5 Summary of changes: pom.xml | 8 ++--- topia-it/pom.xml | 2 +- .../topiatest/persistence/Entity1Impl.hbm.xml | 19 +++++------ .../topia/persistence/internal/TopiaDaoTest.java | 2 +- topia-it/src/test/resources/log4j.properties | 4 +-- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../SchemaValidationTopiaException.java | 4 +-- .../topia/persistence/TopiaEntityContextable.java | 2 +- .../nuiton/topia/persistence/util/TopiaUtil.java | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- .../src/test/resources/log4j.properties | 1 - topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- .../src/test/resources/log4j.properties | 3 +- topia-service-replication/pom.xml | 2 +- .../src/test/resources/log4j.properties | 3 +- topia-templates/pom.xml | 2 +- .../templates/EntityHibernateMappingGenerator.java | 37 +++++++++++----------- .../topia/templates/TopiaTemplateHelper.java | 2 ++ 21 files changed, 51 insertions(+), 54 deletions(-) -- 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 https://gitlab.nuiton.org/nuiton/topia.git commit c4b9beb531094a0ff3269e079bd68cd68688612a Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Apr 14 11:39:57 2017 +0200 fixes #650: Update to hibernate 5.1.5 --- pom.xml | 8 ++--- topia-it/pom.xml | 2 +- .../topiatest/persistence/Entity1Impl.hbm.xml | 19 +++++------ .../topia/persistence/internal/TopiaDaoTest.java | 2 +- topia-it/src/test/resources/log4j.properties | 4 +-- topia-junit/pom.xml | 2 +- topia-persistence/pom.xml | 2 +- .../SchemaValidationTopiaException.java | 4 +-- .../topia/persistence/TopiaEntityContextable.java | 2 +- .../nuiton/topia/persistence/util/TopiaUtil.java | 2 +- topia-service-csv/pom.xml | 2 +- topia-service-flyway/pom.xml | 2 +- .../src/test/resources/log4j.properties | 1 - topia-service-liquibase/pom.xml | 2 +- topia-service-migration/pom.xml | 2 +- .../src/test/resources/log4j.properties | 3 +- topia-service-replication/pom.xml | 2 +- .../src/test/resources/log4j.properties | 3 +- topia-templates/pom.xml | 2 +- .../templates/EntityHibernateMappingGenerator.java | 37 +++++++++++----------- .../topia/templates/TopiaTemplateHelper.java | 2 ++ 21 files changed, 51 insertions(+), 54 deletions(-) diff --git a/pom.xml b/pom.xml index dcc79cf..62188fe 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2016 CodeLutin, Chatellier Eric + Copyright (C) 2004 - 2017 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 @@ -29,11 +29,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10.2</version> + <version>10.5</version> </parent> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -225,7 +225,7 @@ <h2Version>1.3.176</h2Version> <hamcrestVersion>1.3</hamcrestVersion> - <hibernateVersion>5.1.3.Final</hibernateVersion> + <hibernateVersion>5.1.5.Final</hibernateVersion> <javassistVersion>3.20.0-GA</javassistVersion> <junitVersion>4.12</junitVersion> <liquibaseVersion>3.5.3</liquibaseVersion> diff --git a/topia-it/pom.xml b/topia-it/pom.xml index 2502268..7795c12 100644 --- a/topia-it/pom.xml +++ b/topia-it/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.hbm.xml b/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.hbm.xml index 465280c..876bab6 100644 --- a/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.hbm.xml +++ b/topia-it/src/main/java/org/nuiton/topia/it/legacy/topiatest/persistence/Entity1Impl.hbm.xml @@ -23,14 +23,15 @@ #L% --> -<!--<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">--> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.nuiton.topia.it.legacy.topiatest"> - <class name="org.nuiton.topia.it.legacy.topiatest.persistence.Entity1Impl" table="entity1" node="org.nuiton.topia.it.legacy.topiatest.persistence.Entity1Impl" abstract="false" proxy="org.nuiton.topia.it.legacy.topiatest.persistence.Entity1" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> - <property name="attr1" type="java.lang.String" access="field" column="attr1" node="attr1"/> - <property name="attr2" type="java.lang.String" access="field" column="attr2" node="attr2"/> +<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping" + xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping classpath://org/hibernate/hibernate-mapping-4.0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + default-access="field" auto-import="true" package="org.nuiton.topia.it.legacy.topiatest"> + <class name="org.nuiton.topia.it.legacy.topiatest.persistence.Entity1Impl" table="entity1" abstract="false" proxy="org.nuiton.topia.it.legacy.topiatest.persistence.Entity1" > + <id name="topiaId" type="string" length="255"/> + <version name="topiaVersion" type="long"/> + <property name="topiaCreateDate" type="timestamp"/> + <property name="attr1" type="java.lang.String" access="field" column="attr1"/> + <property name="attr2" type="java.lang.String" access="field" column="attr2"/> </class> </hibernate-mapping> diff --git a/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java b/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java index e2ace0b..82950e0 100644 --- a/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/persistence/internal/TopiaDaoTest.java @@ -6,7 +6,7 @@ package org.nuiton.topia.persistence.internal; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric + * 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 diff --git a/topia-it/src/test/resources/log4j.properties b/topia-it/src/test/resources/log4j.properties index 6debfb4..4aa35c0 100644 --- a/topia-it/src/test/resources/log4j.properties +++ b/topia-it/src/test/resources/log4j.properties @@ -4,7 +4,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2004 - 2014 CodeLutin +# Copyright (C) 2004 - 2017 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 @@ -21,7 +21,6 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -#\u00a0This log is used to display trace in generation # Global logging configuration log4j.rootLogger=WARN, stdout @@ -33,5 +32,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n log4j.logger.org.nuiton.topia=INFO #log4j.logger.org.nuiton.topia.it.legacy.topiatest=DEBUG log4j.logger.org.nuiton.topia.persistence.util=INFO -log4j.logger.org.hibernate.orm.deprecation=ERROR diff --git a/topia-junit/pom.xml b/topia-junit/pom.xml index 371f6a0..9f1568d 100644 --- a/topia-junit/pom.xml +++ b/topia-junit/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/pom.xml b/topia-persistence/pom.xml index 3a47d2c..d50bd43 100644 --- a/topia-persistence/pom.xml +++ b/topia-persistence/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/SchemaValidationTopiaException.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/SchemaValidationTopiaException.java index d11fca3..be961ea 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/SchemaValidationTopiaException.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/SchemaValidationTopiaException.java @@ -25,7 +25,7 @@ package org.nuiton.topia.persistence; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import org.hibernate.HibernateException; -import org.hibernate.tool.schema.internal.SchemaValidatorImpl; +import org.hibernate.tool.schema.internal.AbstractSchemaValidator; import java.util.Arrays; @@ -46,7 +46,7 @@ public class SchemaValidationTopiaException extends TopiaException { @Override public boolean apply(StackTraceElement input) { - return input.getClassName().equals(SchemaValidatorImpl.class.getName()) + return input.getClassName().equals(AbstractSchemaValidator.class.getName()) && input.getMethodName().equals("doValidation"); } }; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java index d574803..5696b78 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java @@ -6,7 +6,7 @@ package org.nuiton.topia.persistence; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric, Chemit Tony + * 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 diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java index 5975c05..4430d7d 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaUtil.java @@ -6,7 +6,7 @@ package org.nuiton.topia.persistence.util; * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric + * 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 diff --git a/topia-service-csv/pom.xml b/topia-service-csv/pom.xml index b69576a..137ecdb 100644 --- a/topia-service-csv/pom.xml +++ b/topia-service-csv/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/pom.xml b/topia-service-flyway/pom.xml index 613894f..7b4b18e 100644 --- a/topia-service-flyway/pom.xml +++ b/topia-service-flyway/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-flyway/src/test/resources/log4j.properties b/topia-service-flyway/src/test/resources/log4j.properties index 7828f98..14bde95 100644 --- a/topia-service-flyway/src/test/resources/log4j.properties +++ b/topia-service-flyway/src/test/resources/log4j.properties @@ -29,5 +29,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level log4j.logger.org.nuiton.topia=TRACE #log4j.logger.org.nuiton.topia.migration=DEBUG -log4j.logger.org.hibernate.orm.deprecation=ERROR #log4j.logger.org.flywaydb.core.internal.dbsupport.SqlScript=DEBUG diff --git a/topia-service-liquibase/pom.xml b/topia-service-liquibase/pom.xml index 776007a..835b87f 100644 --- a/topia-service-liquibase/pom.xml +++ b/topia-service-liquibase/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/pom.xml b/topia-service-migration/pom.xml index 25abb73..758e349 100644 --- a/topia-service-migration/pom.xml +++ b/topia-service-migration/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-migration/src/test/resources/log4j.properties b/topia-service-migration/src/test/resources/log4j.properties index 84f12e0..3121ecc 100644 --- a/topia-service-migration/src/test/resources/log4j.properties +++ b/topia-service-migration/src/test/resources/log4j.properties @@ -31,5 +31,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level log4j.logger.org.nuiton.topia=INFO -#log4j.logger.org.nuiton.topia.migration=DEBUG -log4j.logger.org.hibernate.orm.deprecation=ERROR \ No newline at end of file +#log4j.logger.org.nuiton.topia.migration=DEBUG \ No newline at end of file diff --git a/topia-service-replication/pom.xml b/topia-service-replication/pom.xml index c61129c..3c741ec 100644 --- a/topia-service-replication/pom.xml +++ b/topia-service-replication/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-service-replication/src/test/resources/log4j.properties b/topia-service-replication/src/test/resources/log4j.properties index 3ad45ec..84c1fbb 100644 --- a/topia-service-replication/src/test/resources/log4j.properties +++ b/topia-service-replication/src/test/resources/log4j.properties @@ -32,5 +32,4 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n # package level log4j.logger.org.nuiton.topia=INFO #log4j.logger.org.nuiton.topia.persistence.util=DEBUG -#log4j.logger.org.nuiton.topia.replication=DEBUG -log4j.logger.org.hibernate.orm.deprecation=ERROR \ No newline at end of file +#log4j.logger.org.nuiton.topia.replication=DEBUG \ No newline at end of file diff --git a/topia-templates/pom.xml b/topia-templates/pom.xml index fbf9b09..b70c978 100644 --- a/topia-templates/pom.xml +++ b/topia-templates/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java index 65f66c2..7a44755 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java @@ -241,7 +241,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { generateFromTagValue(optionalAttributesMap,HIBERNATE_ATTRIBUTE_DISCRIMINATOR_VALUE, clazzDOType); } String optionalAttributes = attributesToString(optionalAttributesMap); -/*{ <<%=inheritanceStrategy%> name="<%=clazzDOType%>" extends="<%=superClassDOType%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>"<%=optionalAttributes%>> +/*{ <<%=inheritanceStrategy%> name="<%=clazzDOType%>" extends="<%=superClassDOType%>" abstract="<%=isAbstract%>"<%=optionalAttributes%>> }*/ if ("joined-subclass".equals(inheritanceStrategy)) { /*{ <key column="topiaId" /> @@ -251,8 +251,8 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { noneNaturalAttributes.addAll(input.getAttributes()); } else { String optionalAttributes = attributesToString(optionalAttributesMap); -/*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>"<%=optionalAttributes%>> - <id name="topiaId" type="string" length="255" node="@topiaId"/> +/*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" abstract="<%=isAbstract%>"<%=optionalAttributes%>> + <id name="topiaId" type="string" length="255"/> }*/ // cas où on defini la super class, il faut un discriminator seulement dans le cas de // la strategy subclass @@ -285,8 +285,8 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { /*{ </natural-id> }*/ } -/*{ <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> +/*{ <version name="topiaVersion" type="long"/> + <property name="topiaCreateDate" type="timestamp"/> }*/ } @@ -435,7 +435,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { if (classContext.isGenerateForeignKeyNames()) { foreignKeyName = " " + generateFromTagValue(HIBERNATE_ATTRIBUTE_FOREIGN_KEY, classContext.getForeignKeyName(attrColumn)).trim(); } -/*{<%=prefix%> <many-to-one name="<%=attrName%>" class="<%=attrType%>" <%=lazy%>column="<%=attrColumn%>" node="<%=attrName%>/@topiaId" <%=notNull%><%=foreignKeyName%>/> +/*{<%=prefix%> <many-to-one name="<%=attrName%>" class="<%=attrType%>" <%=lazy%>column="<%=attrColumn%>" <%=notNull%><%=foreignKeyName%>/> }*/ // } //Ne sert plus grâce à l'utilisation de la navigabilité @@ -632,7 +632,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { // simple case with no column node to generate -/*{ column="<%=attrColumn%>" node="<%=attrName%>"<%=optionalAttributes%>}*/ +/*{ column="<%=attrColumn%>"<%=optionalAttributes%>}*/ if (attrIsEnumeration) { /*{> <%=prefix%> <type name="org.hibernate.type.EnumType"> @@ -696,7 +696,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { ObjectModelAttribute attr, String prefix) throws IOException { // boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model); -/// *{ <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(templateHelper.notEmpty(attr.getTagValue(templateHelper.TAG_LENGTH))?(" length=\"" + attr.getTagValue(templateHelper.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> node="<%=getName(attr)%>/@topiaId" /> +/// *{ <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(templateHelper.notEmpty(attr.getTagValue(templateHelper.TAG_LENGTH))?(" length=\"" + attr.getTagValue(templateHelper.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> /> //} */ // for hibernate many-to-one with unique="true" => one-to-one @@ -740,16 +740,16 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { foreignKeyAttribute = " " + generateFromTagValue(HIBERNATE_ATTRIBUTE_FOREIGN_KEY, classContext.getForeignKeyName(columnName)).trim(); } if (needsIndex) { -/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=lazy%><%=cascade%>node="<%=attrName%>"> +/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=lazy%><%=cascade%>> <%=prefix%> <key column="<%=reverseAttrDBName%>"<%=foreignKeyAttribute%>/> <%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> -<%=prefix%> <one-to-many class="<%=attrType%>" node="topiaId"/> +<%=prefix%> <one-to-many class="<%=attrType%>"/> <%=prefix%> </<%=collType%>> }*/ }else { -/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=orderBy%><%=fetch%><%=lazy%><%=cascade%>node="<%=attrName%>"> +/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=inverse%><%=orderBy%><%=fetch%><%=lazy%><%=cascade%>> <%=prefix%> <key column="<%=reverseAttrDBName%>"<%=foreignKeyAttribute%>/> -<%=prefix%> <one-to-many class="<%=attrType%>" node="topiaId"/> +<%=prefix%> <one-to-many class="<%=attrType%>"/> <%=prefix%> </<%=collType%>> }*/ } @@ -816,13 +816,14 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { String lazy = generateFromTagValue(HIBERNATE_ATTRIBUTE_LAZY, topiaHibernateTagValues.getLazyTagValue(attr)); String attrColumn = templateHelper.getDbName(attr); String foreignKeyAttribute = ""; + String tableName = templateHelper.getManyToManyTableName(attr); if (classContext.isGenerateForeignKeyNames()) { foreignKeyAttribute = " " + HIBERNATE_ATTRIBUTE_FOREIGN_KEY + "=\"" + classContext.getTableName() + "_" + attrColumn + "\""; } boolean attrIsEnumeration = attr.getClassifier() != null && attr.getClassifier().isEnum(); -/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" <%=lazy%>node="<%=attrName%>"> +/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" table="<%=tableName%>" <%=lazy%>> <%=prefix%> <key column="OWNER"/> }*/ if (needsIndex) { @@ -832,7 +833,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { if (attrIsEnumeration) { boolean useEnumerationName = topiaHibernateTagValues.hasUseEnumerationNameTagValue(attr, classContext.getInput(), classContext.getPackage(), model); -/*{<%=prefix%> <element column="<%=attrColumn%>" node="id"> +/*{<%=prefix%> <element column="<%=attrColumn%>"> <%=prefix%> <type name="org.hibernate.type.EnumType"> <%=prefix%> <param name="<%=org.hibernate.type.EnumType.ENUM%>"><%=attrType%></param> }*/ @@ -848,7 +849,7 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { <%=prefix%> </element> }*/ } else { -/*{<%=prefix%> <element type="<%=attrType%>" column="<%=attrColumn%>" node="id"/> +/*{<%=prefix%> <element type="<%=attrType%>" column="<%=attrColumn%>"/> }*/ } /*{<%=prefix%> </<%=collType%>> @@ -892,8 +893,6 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { if (isUnique) { /*{unique="true" }*/ } -/*{node="<%=attrName%>/@topiaId"}*/ - /*{/> }*/ } @@ -953,14 +952,14 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { reverseForeignKeyName = " " + generateFromTagValue(HIBERNATE_ATTRIBUTE_FOREIGN_KEY, classContext.getForeignKeyName(tableName, attrColumn)).trim(); } -/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" table="<%=tableName%>" <%=inverse%><%=lazy%><%=cascade%> node="<%=attrName%>"<%=optionalAttributes%>> +/*{<%=prefix%> <<%=collType%> name="<%=attrName%>" table="<%=tableName%>" <%=inverse%><%=lazy%><%=cascade%><%=optionalAttributes%>> <%=prefix%> <key column="<%=reverseAttrDBName%>"<%=foreignKeyName%>/> }*/ if (needsIndex) { /*{<%=prefix%> <list-index column="<%=reverseAttrDBName%>_idx"/> }*/ } -/*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" <%=orderBy%>node="topiaId"<%=reverseForeignKeyName%>/> +/*{<%=prefix%> <many-to-many class="<%=attrType%>" column="<%=attrColumn%>" <%=orderBy%><%=reverseForeignKeyName%>/> <%=prefix%> </<%=collType%>> }*/ } diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java index 612fd57..835df90 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaTemplateHelper.java @@ -575,6 +575,8 @@ public class TopiaTemplateHelper { String name = attr.getName(); String revers = attr.getReverseAttributeName(); + // FIXME echatellier 20170414 in case of attribute with * multiplicity + // name is wrong. Should always be "parenttablename_attributename" and name sort compare if (name.compareToIgnoreCase(revers) < 0) { result = name + '_' + revers; } else { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm