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

r2337 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 11:03:20 +0200 (Thu, 22 Sep 2011) New Revision: 2337 Url: http://nuiton.org/repositories/revision/topia/2337 Log: Use generated serialVersionUID from eugene Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-21 22:20:20 UTC (rev 2336) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-22 09:03:20 UTC (rev 2337) @@ -176,16 +176,39 @@ generateToStringOperation(input); } + // Generate serialVersionUID on abstract class + generateSerialVersionUID(input, outputAbstract); + // Generate Entity Implementation class boolean generateImpl = isGenerateImpl(input, input.getOperations()); if (generateImpl) { generateImpl(input); + generateSerialVersionUID(input, outputImpl); } + + // Clean data output after transformation clean(); } + protected void generateSerialVersionUID(ObjectModelClass input, + ObjectModelClass ouput) { + + // serialVersionUID + String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, + input, + model + ); + if (svUID == null) { + + // use a default one + svUID = "" + TopiaGeneratorUtil.generateSerialVersionUID(ouput); + } + addConstant(ouput, SERIAL_VERSION_UID, long.class, svUID, + ObjectModelModifier.PRIVATE); + } + protected void createEntityInterface(ObjectModelClass input) { outputInterface = createInterface(input.getName(), @@ -278,19 +301,6 @@ setSuperClass(outputAbstract, TopiaEntityAbstract.class); } - // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, - input, - model - ); - if (svUID == null) { - - // use a default one - svUID = "1L"; - } - addConstant(outputAbstract, SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); - addContextableMethods(input, outputAbstract); } @@ -386,16 +396,6 @@ setDocumentation(outputImpl, "Implantation des operations pour l'entité " + input.getName() + "."); setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); - - String svUID = - TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model); - if (svUID == null) { - - // use a default one - svUID = "1L"; - } - addConstant(outputImpl, SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); } /**

1 0

r2336 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/java/org/nuiton/topiatest test/xmi
by tchemit＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: tchemit Date: 2011-09-22 00:20:20 +0200 (Thu, 22 Sep 2011) New Revision: 2336 Url: http://nuiton.org/repositories/revision/topia/2336 Log: Anomalie #1732: Cannot compile with N multiplicity to an enumeration Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-21 18:13:28 UTC (rev 2335) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -615,8 +615,7 @@ // getXXX addMultipleGetOperation(attribute, collectionInterface); - if (!TopiaGeneratorUtil.isPrimitiveType(attribute) && - !TopiaGeneratorUtil.isDateType(attribute)) { + if (TopiaGeneratorUtil.isEntity(attribute, model)) { // getXXXByTopiaId addMultipleGetTopiaIdOperation(attribute); 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 2011-09-21 18:13:28 UTC (rev 2335) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -101,8 +101,8 @@ * The Eugene provider of tag values and stereotypes. * * @author tchemit <chemit(a)codelutin.com> + * @plexus.component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" role-hint="topia" * @since 2.3 - * @plexus.component role="org.nuiton.eugene.ModelPropertiesUtil$ModelPropertiesProvider" role-hint="topia" */ public static class TopiaModelPropertiesProvider extends ModelPropertiesUtil.ModelPropertiesProvider { @@ -823,7 +823,7 @@ /** * Retourne true si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} * à la valeur {@code true}. - * + * * @param classifier classifier to test * @return {@code true} si {@link TopiaTagValues#TAG_CONTEXTABLE} == {@code true} */ @@ -970,7 +970,7 @@ fqns.remove(VOID_TYPE); int packageLength = packageName.length(); List<String> genericType = new ArrayList<String>(); - for (Iterator<String> it = fqns.iterator(); it.hasNext();) { + for (Iterator<String> it = fqns.iterator(); it.hasNext(); ) { String fqn = it.next(); int lastIndex = fqn.lastIndexOf("."); if (lastIndex == packageLength && fqn.startsWith(packageName)) { @@ -993,7 +993,7 @@ /** * Obtain the class to use as abstract dao. - * + * <p/> * It will look after a tag value {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} in model * and if not found will use the default value which is {@link TopiaDAOImpl}. * @@ -1081,7 +1081,7 @@ } public static boolean isImportNeeded(Collection<ObjectModelOperation> operations, - String importName) { + String importName) { if (CollectionUtils.isNotEmpty(operations)) { for (ObjectModelOperation op : operations) { if (op.getReturnType().contains(importName)) { @@ -1135,17 +1135,38 @@ } /** + * Check if the given attribute type is an entity. + * + * @param attribute attribute to test + * @param model model containing the attribute + * @return {@code true} if type of attribute is an entity, + * {@code false} otherwise + * @see TopiaStereoTypes#STEREOTYPE_ENTITY + * @since 2.7 + */ + public static boolean isEntity(ObjectModelAttribute attribute, + ObjectModel model) { + if (isPrimitiveType(attribute)) { + return false; + } + String attributeType = attribute.getType(); + ObjectModelClassifier typeclassifier = + model.getClassifier(attributeType); + return typeclassifier != null && isEntity(typeclassifier); + } + + /** * Check if the given classifier has the * {@link TopiaStereoTypes#STEREOTYPE_ENTITY} and is not an enumeration * * @param classifier classifier to test * @return {@code true} if stereotype was found and classifier is not - * enumeration, {@code false} otherwise + * enumeration, {@code false} otherwise * @see TopiaStereoTypes#STEREOTYPE_ENTITY * @since 2.5 */ public static boolean isEntity(ObjectModelClassifier classifier) { - return hasEntityStereotype(classifier) && ! classifier.isEnum(); + return hasEntityStereotype(classifier) && !classifier.isEnum(); } @@ -1732,7 +1753,7 @@ * <p/> * * @param classifier classifier to seek - * @param model model 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_NO_LOG_IN_SERVICE * @since 2.5 @@ -1744,7 +1765,7 @@ return value; } - /** + /** * Obtain the value of the {@link TopiaTagValues#TAG_DAO_IMPLEMENTATION} * tag value on the given model. * <p/> Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java 2011-09-21 18:13:28 UTC (rev 2335) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Gender.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -25,5 +25,5 @@ package org.nuiton.topiatest; public enum Gender { - MALE, FEMALE; + MALE, FEMALE } Added: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java (rev 0) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java 2011-09-21 22:20:20 UTC (rev 2336) @@ -0,0 +1,13 @@ +package org.nuiton.topiatest; + +/** + * To test http://nuiton.org/issues/1732. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.2 + */ +public enum Title { + Mr, + Madam, + Other +} Property changes on: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r2335 - trunk/topia-persistence
by tchemit＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: tchemit Date: 2011-09-21 20:13:28 +0200 (Wed, 21 Sep 2011) New Revision: 2335 Url: http://nuiton.org/repositories/revision/topia/2335 Log: onyl invoke its at release due to MINVOKER-107 Modified: trunk/topia-persistence/pom.xml Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-21 07:43:37 UTC (rev 2334) +++ trunk/topia-persistence/pom.xml 2011-09-21 18:13:28 UTC (rev 2335) @@ -305,8 +305,11 @@ <id>run-its</id> <activation> <property> - <name>maven.test.skip</name> - <value>!false</value> + <name>performRelease</name> + <value>true</value> +  +  </property> </activation> <build>

1 0

r2334 - trunk/topia-persistence/src/test/java/org/nuiton/topia/framework
by athimel＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: athimel Date: 2011-09-21 09:43:37 +0200 (Wed, 21 Sep 2011) New Revision: 2334 Url: http://nuiton.org/repositories/revision/topia/2334 Log: Invert assertEquals............ Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2011-09-21 07:40:09 UTC (rev 2333) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2011-09-21 07:43:37 UTC (rev 2334) @@ -158,9 +158,9 @@ log.debug("Query : " + query); - Assert.assertEquals(query.fullQuery(), - "FROM " + QueriedEntity.class.getName() + - " ORDER BY " + QueriedEntity.PROPERTY_TEST_ADD); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + + " ORDER BY " + QueriedEntity.PROPERTY_TEST_ADD, + query.fullQuery()); filter.setOrderBy(null); @@ -168,19 +168,24 @@ log.debug("Query : " + query); - Assert.assertEquals(query.fullQuery(), - "FROM " + QueriedEntity.class.getName() + - " ORDER BY " + TopiaEntity.TOPIA_CREATE_DATE + " DESC"); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + + " ORDER BY " + TopiaEntity.TOPIA_CREATE_DATE + " DESC", + query.fullQuery()); } @Test + // cf http://nuiton.org/issues/1745 public void testWhereWithFunction() { + TopiaQuery query = new TopiaQuery(QueriedEntity.class); query.addWhere("lower(name)", TopiaQuery.Op.LIKE, "%azerty%"); + log.debug("Query : " + query); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + - " WHERE lower(name) LIKE :lower_name_", query.fullQuery()); + " WHERE lower(name) LIKE :lower_name_", + query.fullQuery()); } }

1 0

r2333 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia/framework
by athimel＠users.nuiton.org 21 Sep '11

21 Sep '11

Author: athimel Date: 2011-09-21 09:40:09 +0200 (Wed, 21 Sep 2011) New Revision: 2333 Url: http://nuiton.org/repositories/revision/topia/2333 Log: #1745 Cannot use a function on TopiaQuery Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2011-09-13 10:09:10 UTC (rev 2332) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2011-09-21 07:40:09 UTC (rev 2333) @@ -735,6 +735,11 @@ if (dot != -1) { valueName = paramName.substring(dot + 1); } + + // If the paramName contains a function, escape parenthesis + valueName = valueName.replace('(', '_'); + valueName = valueName.replace(')', '_'); + if (getParams().contains(valueName)) { valueName = valueName + "_" + RandomStringUtils.randomAlphanumeric(4); Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2011-09-13 10:09:10 UTC (rev 2332) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2011-09-21 07:40:09 UTC (rev 2333) @@ -174,4 +174,13 @@ } + @Test + public void testWhereWithFunction() { + TopiaQuery query = new TopiaQuery(QueriedEntity.class); + query.addWhere("lower(name)", TopiaQuery.Op.LIKE, "%azerty%"); + log.debug("Query : " + query); + Assert.assertEquals("FROM " + QueriedEntity.class.getName() + + " WHERE lower(name) LIKE :lower_name_", query.fullQuery()); + } + }

1 0

r2332 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 13 Sep '11

13 Sep '11

Author: tchemit Date: 2011-09-13 12:09:10 +0200 (Tue, 13 Sep 2011) New Revision: 2332 Url: http://nuiton.org/repositories/revision/topia/2332 Log: change log level Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-09-12 14:43:31 UTC (rev 2331) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaConnectionProvider.java 2011-09-13 10:09:10 UTC (rev 2332) @@ -117,7 +117,6 @@ poolSize = PropertiesHelper.getInt(Environment.POOL_SIZE, props, 20); //default pool size 20 if (log.isDebugEnabled()) { - log.debug("Connection pool size: " + poolSize); } @@ -167,14 +166,14 @@ connectionProps = ConnectionProviderFactory.getConnectionProperties(props); - if (log.isInfoEnabled()) { - log.info("using driver: " + driverClass + " at URL: " + url); + if (log.isDebugEnabled()) { + log.debug("using driver: " + driverClass + " at URL: " + url); } // if debug level is enabled, then log the password, otherwise mask it - if (log.isDebugEnabled()) { - log.info("connection properties: " + connectionProps); - } else if (log.isInfoEnabled()) { - log.info("connection properties: " + + if (log.isTraceEnabled()) { + log.debug("connection properties: " + connectionProps); + } else if (log.isDebugEnabled()) { + log.debug("connection properties: " + PropertiesHelper.maskOut(connectionProps, "password")); } } @@ -279,8 +278,8 @@ @Override public void close() { - if (log.isInfoEnabled()) { - log.info("cleaning up connection pool: " + url); + if (log.isDebugEnabled()) { + log.debug("cleaning up connection pool: " + url); } for (Connection connection : pool) {

1 0

r2331 - trunk/topia-persistence
by tchemit＠users.nuiton.org 12 Sep '11

12 Sep '11

Author: tchemit Date: 2011-09-12 16:43:31 +0200 (Mon, 12 Sep 2011) New Revision: 2331 Url: http://nuiton.org/repositories/revision/topia/2331 Log: convention over configuration Modified: trunk/topia-persistence/pom.xml Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-12 13:33:21 UTC (rev 2330) +++ trunk/topia-persistence/pom.xml 2011-09-12 14:43:31 UTC (rev 2331) @@ -315,7 +315,6 @@ <plugin> <artifactId>maven-invoker-plugin</artifactId> <configuration> - <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo>

1 0

r2330 - trunk/topia-persistence/src/it
by tchemit＠users.nuiton.org 12 Sep '11

12 Sep '11

Author: tchemit Date: 2011-09-12 15:33:21 +0200 (Mon, 12 Sep 2011) New Revision: 2330 Url: http://nuiton.org/repositories/revision/topia/2330 Log: fix IT repositories setting Modified: trunk/topia-persistence/src/it/settings.xml Modified: trunk/topia-persistence/src/it/settings.xml =================================================================== --- trunk/topia-persistence/src/it/settings.xml 2011-09-12 13:27:22 UTC (rev 2329) +++ trunk/topia-persistence/src/it/settings.xml 2011-09-12 13:33:21 UTC (rev 2330) @@ -48,9 +48,9 @@ <repository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> - <enabled>false</enabled> + <enabled>true</enabled> </snapshots> <releases> <enabled>true</enabled> @@ -58,19 +58,6 @@ </releases> </repository> -  - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> </repositories> <pluginRepositories> @@ -88,7 +75,7 @@ <pluginRepository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -96,20 +83,6 @@ <enabled>true</enabled> </releases> </pluginRepository> - -  - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> </pluginRepositories> </profile> </profiles>

1 0

12 Sep '11

Author: tchemit Date: 2011-09-12 15:27:22 +0200 (Mon, 12 Sep 2011) New Revision: 2329 Url: http://nuiton.org/repositories/revision/topia/2329 Log: add it for Anomalie #1640: Cannot create TopiaContext when using an abstract class Added: trunk/topia-persistence/src/it/ trunk/topia-persistence/src/it/ANOMALIE-1640/ trunk/topia-persistence/src/it/ANOMALIE-1640/LICENSE.txt trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt trunk/topia-persistence/src/it/ANOMALIE-1640/changelog.txt trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy trunk/topia-persistence/src/it/ANOMALIE-1640/src/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.zargo trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties trunk/topia-persistence/src/it/settings.xml Modified: trunk/pom.xml trunk/topia-persistence/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-12 12:09:52 UTC (rev 2328) +++ trunk/pom.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -75,6 +75,7 @@ <hibernateVersion>3.6.7.Final</hibernateVersion>  <sl4jVersion>1.6.1</sl4jVersion> + <h2Version>1.3.160</h2Version>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -164,7 +165,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.157</version> + <version>${h2Version}</version> <scope>test</scope> </dependency> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-12 12:09:52 UTC (rev 2328) +++ trunk/topia-persistence/pom.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -301,6 +301,41 @@ </build> </profile> + <profile> + <id>run-its</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>!false</value> + </property> + </activation> + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <debug>${maven.verbose}</debug> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> +  <profile> <id>reporting</id> Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1 @@ +To test the http://nuiton.org/issues/1640 bug. \ No newline at end of file Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,46 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2011 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% +### + +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean test + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-fast + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>3.0.3</version> + </parent> + + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-test-ANOMALIE-1640</artifactId> + <version>@pom.version@</version> + +  +  +  + + <name>Topia :: ANOMALIE-1640</name> + <description>Module de test pour Topia avec entités abstraites</description> + <url>http://nuiton.org/issues/1640</url> + +  +  +  + <properties> + <eugeneVersion>@eugeneVersion@</eugeneVersion> + <hibernateVersion>@hibernateVersion@</hibernateVersion> + <slf4jVersion>@sl4jVersion@</slf4jVersion> + <h2Version>@h2Version@</h2Version> + </properties> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>test</scope> + <version>${slf4jVersion}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>test</scope> + <version>${slf4jVersion}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugeneVersion}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <executions> + <execution> + <id>generate-entities</id> + <phase>generate-sources</phase> + <configuration> +  + <fullPackagePath>org.nuiton.topia.testabstract</fullPackagePath> +  + <defaultPackage>org.nuiton.topia.testabstract</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,26 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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% + */ +// Tests are made in the test phase +return true; \ No newline at end of file Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/postbuild.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,27 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2011 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% +### +model.tagvalue.copyright=/* *##%\n Copyright (C) 2011 Code Lutin\n *##%*/ +model.tagvalue.notGenerateToString=true +model.tagvalue.constantPrefix=PROPERTY_ Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.zargo =================================================================== (Binary files differ) Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/main/xmi/topiatest-absract.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,49 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 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.testabstract; + +import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaException; + +public class TopiaAbstractTest { + + @Test + public void testCreateCar() throws TopiaException { + + TopiaContext context = TopiaContextFactory.getContext(); + try { + TopiaContext transaction = context.beginTransaction(); + + CarDAO carDAO = TopiaTestAbstractDAOHelper.getCarDAO(transaction); + carDAO.create(); + transaction.commitTransaction(); + } finally { + context.closeContext(); + } + } + +} Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/java/org/nuiton/topia/testabstract/TopiaAbstractTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,36 @@ +### +# #%L +# ToPIA :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2004 - 2011 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% +### +topia.persistence.classes=org.nuiton.topia.testabstract.CarImpl,org.nuiton.topia.testabstract.VehicleImpl + +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false +hibernate.format_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:file:target/surefire-workdir/db/mydb + Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/TopiaContextImpl.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties =================================================================== --- trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties (rev 0) +++ trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,30 @@ +### +# #%L +# T3 :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 IRD, 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 +# 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% +### +# Global logging configuration +log4j.rootLogger=INFO, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%F:%L) %M - %m%n Property changes on: trunk/topia-persistence/src/it/ANOMALIE-1640/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/topia-persistence/src/it/settings.xml =================================================================== --- trunk/topia-persistence/src/it/settings.xml (rev 0) +++ trunk/topia-persistence/src/it/settings.xml 2011-09-12 13:27:22 UTC (rev 2329) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<settings> + + <profiles> + <profile> + <id>it-repo</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <repositories> + <repository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + +  + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + +  + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>file:///@localRepository@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + +  + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> +</settings> Property changes on: trunk/topia-persistence/src/it/settings.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2328 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 12 Sep '11

12 Sep '11

Author: tchemit Date: 2011-09-12 14:09:52 +0200 (Mon, 12 Sep 2011) New Revision: 2328 Url: http://nuiton.org/repositories/revision/topia/2328 Log: Anomalie #1640: Cannot create TopiaContext when using an abstract class Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-12 11:10:40 UTC (rev 2327) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-12 12:09:52 UTC (rev 2328) @@ -88,6 +88,8 @@ /** Logger */ private static final Log log = LogFactory.getLog(EntityTransformer.class); + public static final String SERIAL_VERSION_UID = "serialVersionUID"; + protected ObjectModelInterface outputInterface; protected ObjectModelClass outputAbstract; @@ -255,17 +257,19 @@ // Extends for (ObjectModelClass parent : input.getSuperclasses()) { - String extendClass = parent.getQualifiedName(); - //Si une des classes parentes définies des méthodes abstraites, son - // impl ne sera pas créé - boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); - if (TopiaGeneratorUtil.isEntity(parent)) { - if (abstractParent) { - extendClass += "Abstract"; - } else { - extendClass += "Impl"; - } - } + //tchemit-2011-09-12 What ever abstract or not, we alwyas use an Impl, moreover use the util method instead + String extendClass = TopiaGeneratorUtil.getDOType(parent, model); +// String extendClass = parent.getQualifiedName(); +// //Si une des classes parentes définies des méthodes abstraites, son +// // impl ne sera pas créé +// boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); +// if (TopiaGeneratorUtil.isEntity(parent)) { +// if (abstractParent) { +// extendClass += "Abstract"; +// } else { +// extendClass += "Impl"; +// } +// } setSuperClass(outputAbstract, extendClass); } @@ -275,7 +279,7 @@ } // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue("serialVersionUID", + String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model ); @@ -284,7 +288,7 @@ // use a default one svUID = "1L"; } - addConstant(outputAbstract, "serialVersionUID", long.class, svUID, + addConstant(outputAbstract, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE); addContextableMethods(input, outputAbstract); @@ -384,13 +388,13 @@ setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); String svUID = - TopiaGeneratorUtil.findTagValue("serialVersionUID", input, model); + TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model); if (svUID == null) { // use a default one svUID = "1L"; } - addConstant(outputImpl, "serialVersionUID", long.class, svUID, + addConstant(outputImpl, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE); } 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 2011-09-12 11:10:40 UTC (rev 2327) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-09-12 12:09:52 UTC (rev 2328) @@ -43,7 +43,6 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.models.object.validator.AttributeNamesValidator; import org.nuiton.topia.persistence.TopiaDAOImpl; import java.util.ArrayList; @@ -523,11 +522,13 @@ } ObjectModelClass clazz = model.getClass(type); if (isEntity(clazz)) { - if (shouldBeAbstract(clazz)) { - type += "Abstract"; - } else { - type += "Impl"; - } + //tchemit-2011-09-12 What ever abstract or not, we alwyas use an Impl + type += "Impl"; +// if (shouldBeAbstract(clazz)) { +// type += "Abstract"; +// } else { +// type += "Impl"; +// } } return type; }

1 0