Author: ymartel Date: 2012-01-18 17:25:55 +0100 (Wed, 18 Jan 2012) New Revision: 2402 Url: http://nuiton.org/repositories/revision/topia/2402 Log: evo#1912 modify TagValue and property name to topiaId in DTO to avoid confusion with potential field named "id" Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java trunk/topia-persistence/src/test/xmi/topiatest.properties Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -41,7 +41,7 @@ import java.io.Serializable; import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldGenerateDTOIdTagValue; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.shouldGenerateDTOTopiaIdTagValue; /*{generator option: parentheses = false}*/ @@ -101,9 +101,9 @@ addAttribute(result, "serialVersionUID", "long", svUID, ObjectModelModifier.FINAL, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); } - boolean generateDTOId = shouldGenerateDTOIdTagValue(clazz, model); + boolean generateDTOId = shouldGenerateDTOTopiaIdTagValue(clazz, model); if (generateDTOId) { - addAttribute(result, "id", "String"); + addAttribute(result, "topiaId", "String"); } ObjectModelAttribute attr2; @@ -175,21 +175,21 @@ protected void addOperations(ObjectModelClass result,ObjectModelClass clazz) { - boolean generateDTOId = shouldGenerateDTOIdTagValue(clazz, model); + boolean generateDTOId = shouldGenerateDTOTopiaIdTagValue(clazz, model); ObjectModelOperation op; if (generateDTOId) { - op = addOperation(result, "setId", "void", ObjectModelModifier.PUBLIC); - addParameter(op, "String", "id"); + op = addOperation(result, "setTopiaId", "void", ObjectModelModifier.PUBLIC); + addParameter(op, "String", "topiaId"); setOperationBody(op, "" /*{ - this.id = id; + this.topiaId = topiaId; }*/ ); - op = addOperation(result, "getId", "String", ObjectModelModifier.PUBLIC); + op = addOperation(result, "getTopiaId", "String", ObjectModelModifier.PUBLIC); setOperationBody(op, "" /*{ - return id; + return topiaId; }*/ ); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -1802,17 +1802,17 @@ } /** - * Search if the TagValue {@link TopiaTagValues#TAG_GENERATE_ID_IN_DTO} has been + * Search if the TagValue {@link TopiaTagValues#TAG_GENERATE_TOPIA_ID_IN_DTO} has been * activated in the model. * * @param classifier classifier to seek * @param model model to seek * @return the none empty value of the found tag value or {@code null} if not found nor empty. - * @see TopiaTagValues#TAG_GENERATE_ID_IN_DTO + * @see TopiaTagValues#TAG_GENERATE_TOPIA_ID_IN_DTO * @since 2.6.7 */ - public static boolean shouldGenerateDTOIdTagValue(ObjectModelClassifier classifier, ObjectModel model) { - String tagValue = findTagValue(TopiaTagValues.TAG_GENERATE_ID_IN_DTO, classifier, model); + public static boolean shouldGenerateDTOTopiaIdTagValue(ObjectModelClassifier classifier, ObjectModel model) { + String tagValue = findTagValue(TopiaTagValues.TAG_GENERATE_TOPIA_ID_IN_DTO, classifier, model); boolean generate = StringUtils.isNotEmpty(tagValue) && Boolean.valueOf(tagValue); return generate; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -462,10 +462,10 @@ * <p/> * * @see EntityDTOTransformer - * @see TopiaGeneratorUtil#shouldGenerateDTOIdTagValue(ObjectModelClassifier, ObjectModel) + * @see TopiaGeneratorUtil#shouldGenerateDTOTopiaIdTagValue(ObjectModelClassifier, ObjectModel) * @since 2.6.7 */ @TagValueDefinition(target = {ObjectModel.class, ObjectModelClassifier.class}, documentation = "Add a \"id\" property with its getter/setter on a DTO.") - String TAG_GENERATE_ID_IN_DTO = "generateDTOId"; + String TAG_GENERATE_TOPIA_ID_IN_DTO = "generateDTOTopiaId"; } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/test/evo1912/EntityDTOTransformerTest.java 2012-01-18 16:25:55 UTC (rev 2402) @@ -13,11 +13,11 @@ public void testEvo1912() throws Exception { // simply test the getter/setter on id property : with the tagValue, they should be generated CompanyDTO companyDTO = new CompanyDTO(); - String originalId = companyDTO.getId(); + String originalId = companyDTO.getTopiaId(); Assert.assertNull(originalId); String wantedId = "mycompany"; - companyDTO.setId(wantedId); - String updatedId = companyDTO.getId(); + companyDTO.setTopiaId(wantedId); + String updatedId = companyDTO.getTopiaId(); Assert.assertEquals(wantedId, updatedId); } Modified: trunk/topia-persistence/src/test/xmi/topiatest.properties =================================================================== --- trunk/topia-persistence/src/test/xmi/topiatest.properties 2012-01-18 15:45:09 UTC (rev 2401) +++ trunk/topia-persistence/src/test/xmi/topiatest.properties 2012-01-18 16:25:55 UTC (rev 2402) @@ -25,7 +25,7 @@ model.tagvalue.i18n=topia.test.common. model.tagvalue.generateOperatorForDAOHelper=true model.tagvalue.constantPrefix=PROPERTY_ -model.tagvalue.generateDTOId=true +model.tagvalue.generateDTOTopiaId=true # Do not use this tag value (deprecated since 2.5) #model.tagvalue.useLegacyDAO=true