Author: tchemit Date: 2011-02-12 12:23:31 +0100 (Sat, 12 Feb 2011) New Revision: 2205 Url: http://nuiton.org/repositories/revision/topia/2205 Log: Anomalie #1317: Hibernate mapping generation is wrong! Use new i18n api Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-02-10 10:16:59 UTC (rev 2204) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-02-12 11:23:31 UTC (rev 2205) @@ -93,6 +93,12 @@ public static final String HIBERNATE_ATTRIBUTE_NOT_NULL = "not-null"; + public static final String HIBERNATE_ATTRIBUTE_SCHEMA = "schema"; + + public static final String HIBERNATE_ATTRIBUTE_INDEX = "index"; + + public static final String HIBERNATE_ATTRIBUTE_UNIQUE = "unique"; + public static final String HIBERNATE_ATTRIBUTE_LENGTH = "length"; public static final String HIBERNATE_ATTRIBUTE_ORDER_BY = "order-by"; @@ -344,12 +350,14 @@ String optionalAttributes = ""; String schema = TopiaGeneratorUtil.getDbSchemaNameTagValue(attr, model); if (schema != null) { - optionalAttributes += "schema=\"" + schema + "\" "; + optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_SCHEMA, schema); +// optionalAttributes += "schema=\"" + schema + "\" "; } if (JavaGeneratorUtil.hasIndexedStereotype(attr)) { String indexName = tableName + "_idx"; - optionalAttributes += "index=\"" + indexName + "\" "; + optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_INDEX, indexName); +// optionalAttributes += "index=\"" + indexName + "\" "; } /*{<%=prefix%> <primitive-array name="<%=attrName%>" table="<%=tableName%>" access="<%=accessField%>" <%=optionalAttributes%>> @@ -362,12 +370,14 @@ String optionalAttributes = ""; if (JavaGeneratorUtil.hasIndexedStereotype(attr)) { String indexName = tableName + "_idx"; - optionalAttributes += "index=\"" + indexName + "\""; + optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_INDEX, indexName); +// optionalAttributes += "index=\"" + indexName + "\""; } if (TopiaGeneratorUtil.hasUniqueStereotype(attr)) { // the trim method is called on optionalAttributes after this set to suppress unusual space if no index is set on this attribute - optionalAttributes += " unique=\"true\""; + optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_UNIQUE, "true"); +// optionalAttributes += " unique=\"true\""; } optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_NOT_NULL, TopiaGeneratorUtil.getNotNullTagValue(attr)); /*{<%=prefix%> <property name="<%=attrName%>" type="<%=attrType%>" access="<%=accessField%>"}*/ @@ -397,7 +407,7 @@ } optionalAttributes = optionalAttributes.trim(); - if (!optionalAttributes.isEmpty()) { + if (StringUtils.isNotEmpty(optionalAttributes)) { optionalAttributes = " " + optionalAttributes; } @@ -588,7 +598,7 @@ // vérifier si le tag lazy est defini par defaut dans le fichier de proprietes String lazy = generateFromTagValue(HIBERNATE_ATTRIBUTE_LAZY, TopiaGeneratorUtil.getLazyTagValue(attr)); /*{<%=lazy%>}*/ - String notNull = " " + generateFromTagValue(HIBERNATE_ATTRIBUTE_NOT_NULL, TopiaGeneratorUtil.getNotNullTagValue(attr)); + String notNull = generateFromTagValue(HIBERNATE_ATTRIBUTE_NOT_NULL, TopiaGeneratorUtil.getNotNullTagValue(attr)); /*{<%=notNull%>}*/ if (isUnique) { /*{unique="true" }*/ Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2011-02-10 10:16:59 UTC (rev 2204) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaContextImplTest.java 2011-02-12 11:23:31 UTC (rev 2205) @@ -62,7 +62,7 @@ @BeforeClass public static void setUpClass() throws Exception { - I18n.init(Locale.FRENCH); + I18n.init(null, Locale.FRENCH); } @Before