November 2012 - Wikitty-commits - mailman.cloud.codelutin.com

r1523 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/query test/java/org/nuiton/wikitty/query
by bpoussin＠users.nuiton.org 19 Nov '12

19 Nov '12

Author: bpoussin Date: 2012-11-19 18:19:04 +0100 (Mon, 19 Nov 2012) New Revision: 1523 Url: http://nuiton.org/repositories/revision/wikitty/1523 Log: Fixes Anomalie #2447: Wikitty query staring with space pasing throw NullPointerException Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2012-11-19 08:57:20 UTC (rev 1522) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2012-11-19 17:19:04 UTC (rev 1523) @@ -236,6 +236,7 @@ * @return */ static public WikittyQuery parse(String queryString, Map<String, String> alias) { + queryString = StringUtils.strip(queryString); if (queryString == null) { queryString = ""; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java 2012-11-19 08:57:20 UTC (rev 1522) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java 2012-11-19 17:19:04 UTC (rev 1523) @@ -440,7 +440,6 @@ * @throws Exception */ @Test - @Ignore public void testParseSpaceStart() { WikittyQueryMaker cc = new WikittyQueryMaker(); cc.parse(" xxx");

1 0

r1522 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query
by echatellier＠users.nuiton.org 19 Nov '12

19 Nov '12

Author: echatellier Date: 2012-11-19 09:57:20 +0100 (Mon, 19 Nov 2012) New Revision: 1522 Url: http://nuiton.org/repositories/revision/wikitty/1522 Log: refs #2447: add new test for query starting with space Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java 2012-11-09 13:45:28 UTC (rev 1521) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/query/WikittyQueryTest.java 2012-11-19 08:57:20 UTC (rev 1522) @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyImpl; @@ -432,4 +433,16 @@ // test d'equalite sur les representation string des 2 query Assert.assertEquals(queryParsed.toString(), queryCopyParsed.toString()); } + + /** + * Les requettes qui commencent par un espace provoque une erreur de parsing. + * + * @throws Exception + */ + @Test + @Ignore + public void testParseSpaceStart() { + WikittyQueryMaker cc = new WikittyQueryMaker(); + cc.parse(" xxx"); + } }

1 0

r1521 - in trunk: wikitty-api wikitty-api/src/it/generation wikitty-api/src/it/generation/src/main/models wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org 09 Nov '12

09 Nov '12

Author: echatellier Date: 2012-11-09 14:45:28 +0100 (Fri, 09 Nov 2012) New Revision: 1521 Url: http://nuiton.org/repositories/revision/wikitty/1521 Log: fixes #2405 : Wikitty purifier template generate accessor for non navigable association Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel Modified: trunk/wikitty-api/pom.xml trunk/wikitty-api/src/it/generation/pom.xml trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2012-10-30 07:45:06 UTC (rev 1520) +++ trunk/wikitty-api/pom.xml 2012-11-09 13:45:28 UTC (rev 1521) @@ -283,10 +283,6 @@ </build> </profile> -  - <profile> <id>run-its</id> <activation> Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2012-10-30 07:45:06 UTC (rev 1520) +++ trunk/wikitty-api/src/it/generation/pom.xml 2012-11-09 13:45:28 UTC (rev 1521) @@ -152,7 +152,21 @@ <goal>smart-generate</goal> </goals> </execution> - </executions> + + <execution> + <id>entities6 generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>src/main/models:mymodel6.objectmodel</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> <dependencies> <dependency> Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel =================================================================== (Binary files differ) Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-10-30 07:45:06 UTC (rev 1520) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-11-09 13:45:28 UTC (rev 1521) @@ -92,24 +92,27 @@ superClass = model.getClass(superClass.getQualifiedName()); for (ObjectModelAttribute attribute : superClass.getAttributes()) { - String attributeName; + + if (attribute.isNavigable()) { + String attributeName; - // tag value définie par le developpeur - if (attribute.hasTagValue(TAG_ALTERNATIVE_NAME)) { - attributeName = attribute.getTagValue(TAG_ALTERNATIVE_NAME); - } else { - attributeName = attribute.getName(); - } + // tag value définie par le developpeur + if (attribute.hasTagValue(TAG_ALTERNATIVE_NAME)) { + attributeName = attribute.getTagValue(TAG_ALTERNATIVE_NAME); + } else { + attributeName = attribute.getName(); + } - // check conflics - if (attributeNames.contains(attributeName)) { - attributeName += "From" + superClass.getName(); - builder.addTagValue(clazz, TAG_ALTERNATIVE_NAME - + "." + superClass.getName() + "." + attribute.getName(), attributeName); + // check conflics + if (attributeNames.contains(attributeName)) { + attributeName += "From" + superClass.getName(); + builder.addTagValue(clazz, TAG_ALTERNATIVE_NAME + + "." + superClass.getName() + "." + attribute.getName(), attributeName); + } + + // remember new getter name + attributeNames.add(attributeName); } - - // remember new getter name - attributeNames.add(attributeName); } } }

1 0