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

r1329 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport
by echatellier＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: echatellier Date: 2012-01-17 17:04:12 +0100 (Tue, 17 Jan 2012) New Revision: 1329 Url: http://nuiton.org/repositories/revision/wikitty/1329 Log: Rename facet on extension since renaming in 3.3 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-17 11:09:45 UTC (rev 1328) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-17 16:04:12 UTC (rev 1329) @@ -382,7 +382,14 @@ for (Map.Entry<String, List<org.nuiton.wikitty.search.FacetTopic>> e : pagedResult.getFacets().entrySet()) { String facetName = e.getKey(); List<FacetTopic> topics = new ArrayList<FacetTopic>(); - facet.put(facetName, topics); + + // since 3.4, facet extension has changed of name + if (org.nuiton.wikitty.search.operators.Element.ELT_EXTENSION.equals(facetName)) { + facet.put(Element.EXTENSION.getValue(), topics); + } else { + facet.put(facetName, topics); + } + for (org.nuiton.wikitty.search.FacetTopic f : e.getValue()) { topics.add(new FacetTopic(f.getFacetName(), f.getTopicName(), f.getCount())); }

1 0

r1328 - in branches/wikitty-3.3.x: . wikitty-api wikitty-dto wikitty-generators wikitty-generators/src/main/java/org/nuiton/wikitty/generator wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-lucene wikitty-perf-test wikitty-publication wikitty-publication-ui wikitty-solr wikitty-struts wp-maven-plugin
by echatellier＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: echatellier Date: 2012-01-17 12:09:45 +0100 (Tue, 17 Jan 2012) New Revision: 1328 Url: http://nuiton.org/repositories/revision/wikitty/1328 Log: Init branche and readd generation modification Modified: branches/wikitty-3.3.x/pom.xml branches/wikitty-3.3.x/wikitty-api/pom.xml branches/wikitty-3.3.x/wikitty-dto/pom.xml branches/wikitty-3.3.x/wikitty-generators/pom.xml branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml branches/wikitty-3.3.x/wikitty-jdbc/pom.xml branches/wikitty-3.3.x/wikitty-lucene/pom.xml branches/wikitty-3.3.x/wikitty-perf-test/pom.xml branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml branches/wikitty-3.3.x/wikitty-publication/pom.xml branches/wikitty-3.3.x/wikitty-solr/pom.xml branches/wikitty-3.3.x/wikitty-struts/pom.xml branches/wikitty-3.3.x/wp-maven-plugin/pom.xml Modified: branches/wikitty-3.3.x/pom.xml =================================================================== --- branches/wikitty-3.3.x/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> <modules> Modified: branches/wikitty-3.3.x/wikitty-api/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-api/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-api/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-dto/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-dto/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-dto/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-generators/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-17 11:09:45 UTC (rev 1328) @@ -24,17 +24,6 @@ */ package org.nuiton.wikitty.generator; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -46,6 +35,18 @@ import java.util.Random; import java.util.Set; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + /*{generator option: writeString = }*/ /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -131,6 +132,11 @@ addConstructors(abstractClassForThisEntity); addConstants(clazz, abstractClassForThisEntity); addToString(clazz, abstractClassForThisEntity); + + // adding a generated serialVersionUID + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(abstractClassForThisEntity, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); } processedClasses.clear(); @@ -158,17 +164,6 @@ addImport(clazz, LinkedHashSet.class); } - protected void addSerialVersionUID(ObjectModelClass clazz) { - // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(clazz, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); - } - protected void addConstructors(ObjectModelClass clazz) { ObjectModelOperation constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); Modified: branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-17 11:09:45 UTC (rev 1328) @@ -32,11 +32,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelModifier; @@ -137,13 +137,9 @@ setSuperClass(implementation, WikittyTransformerUtil.businessEntityToAbstractName(clazz)); // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(implementation, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(implementation, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); processedClasses.put(clazz, implementation); } Modified: branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-jdbc/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-jdbc/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-jdbc/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: branches/wikitty-3.3.x/wikitty-lucene/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-lucene/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-lucene/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-perf-test/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-perf-test/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-perf-test/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: branches/wikitty-3.3.x/wikitty-publication/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-publication/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-publication/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-solr/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-solr/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-solr/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-struts/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-struts/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-struts/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wp-maven-plugin/pom.xml =================================================================== --- branches/wikitty-3.3.x/wp-maven-plugin/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wp-maven-plugin/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1327 - in branches: . wikitty-3.3.x
by echatellier＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: echatellier Date: 2012-01-17 12:05:06 +0100 (Tue, 17 Jan 2012) New Revision: 1327 Url: http://nuiton.org/repositories/revision/wikitty/1327 Log: New 3.3x branch Added: branches/wikitty-3.3.x/ Property changes on: branches/wikitty-3.3.x ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r1326 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org Jan. 17, 2012

Jan. 17, 2012

Author: echatellier Date: 2012-01-17 11:29:50 +0100 (Tue, 17 Jan 2012) New Revision: 1326 Url: http://nuiton.org/repositories/revision/wikitty/1326 Log: #1908 : serialVersionUID changes at each generation Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-13 16:01:34 UTC (rev 1325) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-17 10:29:50 UTC (rev 1326) @@ -28,6 +28,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -131,6 +132,11 @@ addConstructors(abstractClassForThisEntity); addConstants(clazz, abstractClassForThisEntity); addToString(clazz, abstractClassForThisEntity); + + // adding a generated serialVersionUID + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(abstractClassForThisEntity, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); } processedClasses.clear(); @@ -158,17 +164,6 @@ addImport(clazz, LinkedHashSet.class); } - protected void addSerialVersionUID(ObjectModelClass clazz) { - // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(clazz, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); - } - protected void addConstructors(ObjectModelClass clazz) { ObjectModelOperation constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-13 16:01:34 UTC (rev 1325) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-17 10:29:50 UTC (rev 1326) @@ -37,6 +37,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelModifier; @@ -137,13 +138,9 @@ setSuperClass(implementation, WikittyTransformerUtil.businessEntityToAbstractName(clazz)); // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(implementation, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(implementation, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); processedClasses.put(clazz, implementation); }

1 0

r1325 - trunk/wikitty-api/src/main/resources/org/nuiton
by jcouteau＠users.nuiton.org Jan. 13, 2012

Jan. 13, 2012

Author: jcouteau Date: 2012-01-13 17:01:34 +0100 (Fri, 13 Jan 2012) New Revision: 1325 Url: http://nuiton.org/repositories/revision/wikitty/1325 Log: wikitty gwt module update following refactoring Modified: trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml Modified: trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml =================================================================== --- trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2012-01-13 15:18:37 UTC (rev 1324) +++ trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2012-01-13 16:01:34 UTC (rev 1325) @@ -36,6 +36,7 @@ <exclude name="*Impl.java"/> <exclude name="*Helper.java"/> <exclude name="WikittyProxy.java"/> + <exclude name="WikittyClient.java"/> <exclude name="WikittyService.java"/> <exclude name="WikittyServiceFactory.java"/> <exclude name="WikittyTree.java"/> @@ -44,6 +45,7 @@ <exclude name="search/**/*.java"/> <exclude name="services/**/*.java"/> <exclude name="storage/**/*.java"/> + <exclude name="query/**/*.java"/> </source> <source path="wikitty/entities"> @@ -59,4 +61,26 @@ <exclude name="WikittyMetaExtensionUtil.java"/> </source> + <source path="wikitty/query/conditions"> + <exclude name="AbstractCondition.java"/> + <exclude name="Aggregate.java"/> + <exclude name="And.java"/> + <exclude name="Between.java"/> + <exclude name="Condition*.java"/> + <exclude name="Contain*.java"/> + <exclude name="Equals.java"/> + <exclude name="False.java"/> + <exclude name="Greater*.java"/> + <exclude name="Keyword.java"/> + <exclude name="Less*.java"/> + <exclude name="Like.java"/> + <exclude name="Not*.java"/> + <exclude name="Null.java"/> + <exclude name="Or.java"/> + <exclude name="Select.java"/> + <exclude name="Terminal*.java"/> + <exclude name="True.java"/> + <exclude name="Unlike.java"/> + </source> + </module> \ No newline at end of file

1 0

Jan. 13, 2012

Author: bpoussin Date: 2012-01-13 16:18:37 +0100 (Fri, 13 Jan 2012) New Revision: 1324 Url: http://nuiton.org/repositories/revision/wikitty/1324 Log: Anomalie #1901: ElementField in generated entities not usable on GWT - Element* to entities packages - remove ObjectUtils usage in Element Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementField.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementId.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementNode.java Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Between.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsAll.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsOne.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Equals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Greater.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/GreaterOrEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Keyword.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Less.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/LessOrEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Like.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotNull.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Null.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Select.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalBinaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalTernaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Unlike.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemoryTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -62,7 +62,7 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; -import org.nuiton.wikitty.query.conditions.ElementField; +import org.nuiton.wikitty.entities.ElementField; import org.nuiton.wikitty.query.conditions.Select; import org.nuiton.wikitty.services.WikittyExtensionMigrationRegistry; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -38,7 +38,7 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -33,7 +33,7 @@ import org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryResult; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; public class ExportQueryTask implements Runnable { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -57,7 +57,7 @@ import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; /** * Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Element.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -0,0 +1,123 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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.wikitty.entities; + +import java.io.Serializable; +import org.nuiton.wikitty.WikittyConstants; + +/** + * Class mere qui determine sur quoi porte une condition. Les classes filles + * possible sont par exemple: ElementField, ElementId, ElementExtension + * + * This class and sub classes must be very simple because this class is used + * in Wikitty interface that GWT used. + * + * @author poussin + * @version $Revision$ + * @since 3.3 + * + * Last update: $Date$ + * by : $Author$ + */ +public class Element implements WikittyConstants, Serializable { + + // serialVersionUID is used for serialization. + private static final long serialVersionUID = 1L; + + /** utilise pour creer une condition sur le noeud root de l'arbre */ + public static final ElementNode NODE_ROOT = new ElementNode(ElementNode.FIELD_NODE_ROOT); + /** utilise pour creer une condition sur un noeud ou un de ses peres (le chemin d'acces a un noeud)*/ + public static final ElementNode NODE_PATH = new ElementNode(ElementNode.FIELD_NODE_PATH); + /** utilise pour creer une condition sur la profondeur d'un noeud (root=1) */ + public static final ElementNode NODE_DEPTH = new ElementNode(ElementNode.FIELD_NODE_DEPTH); + + public static final ElementId ID = new ElementId(); + public static final ElementExtension EXTENSION = new ElementExtension(); + public static final ElementField ALL_FIELD = + new ElementField("*" + FQ_FIELD_NAME_SEPARATOR + "*"); + + protected String value; + + public Element() { + } + + public Element(String value) { + this.value = value; + } + + public static Element get(String v) { + Element result; + if (Element.ID.getValue().equalsIgnoreCase(v)) { + result = Element.ID; + } else if (Element.EXTENSION.getValue().equalsIgnoreCase(v)) { + result = Element.EXTENSION; + } else if (Element.NODE_ROOT.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_ROOT; + } else if (Element.NODE_PATH.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_PATH; + } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { + result = Element.NODE_DEPTH; + } else { + result = new ElementField(v); + } + return result; + } + + public String getValue() { + return value; + } + + @Override + public boolean equals(Object obj) { + boolean result; + + if (this == obj) { + result = true; + } else if (obj == null) { + result = false; + } else if (this.getClass().equals(obj.getClass())) { + Element e = (Element)obj; + result = (this.getValue() == e.getValue() // == si les deux sont null + || (this.getValue() != null && e.getValue() != null + && this.getValue().equals(e.getValue()))); + } else { + result = false; + } + return result; + } + + @Override + public int hashCode() { + // a priori, pas de probleme pour utiliser value pour la hash car pas + // moyen de changer sa valeur, une fois l'objet cree + return getValue()==null?0:this.getValue().hashCode(); + } + + @Override + public String toString() { + return value; + } + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementExtension.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementExtension.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -0,0 +1,49 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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.wikitty.entities; + +/** + * Un element qui represente les extensions, vous devez utiliser l'instance + * {@link Element#EXTENSION} + * + * @author poussin + * @version $Revision$ + * @since 3.3 + * + * Last update: $Date$ + * by : $Author$ + */ +public class ElementExtension extends Element { + + private static final long serialVersionUID = 1L; + + public static final String FIELD_EXTENSION = "EXTENSION"; + + protected ElementExtension() { + super(FIELD_EXTENSION); + } + + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementField.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementField.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementField.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -0,0 +1,82 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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.wikitty.entities; + +import org.nuiton.wikitty.entities.WikittyTypes; + +/** + * Element qui porte sur un champs. Le champs doit-ete de la forme + * extname.fieldname. Mais extname ou fieldname ou les deux peuvent etre + * remplace par des *. Au lieu de faire '*.*' il est preferable d'utiliser + * {@link #ALL_FIELD} + * + * @author poussin + * @version $Revision$ + * @since 3.3 + * + * Last update: $Date$ + * by : $Author$ + */ +public class ElementField extends Element { + + private static final long serialVersionUID = 1L; + + final static public String ALL_EXTENSION = "*"; + + /** + * Le parametre doit etre completement qualifier c-a-d: extName.fieldName. + * ex: User.firstName. + * @param fqfield + */ + public ElementField(String fqfield) { + super(fqfield); + } + + /** + * Ce constructeur permet de creer un champs, si a la place de extensionName + * vous passez {@link #ALL_EXTENSION} le champs represente tous les champs + * partant se nom sur toutes les extensions + * @param extensionName + * @param fieldName + */ + public ElementField(String extensionName, String fieldName) { + super(extensionName + FQ_FIELD_NAME_SEPARATOR + fieldName); + } + + /** + * Cree un champs sur toutes les extensions ex: "*.name" en specifiant le + * type du champs ex: "*.birthday.DATE" + * + * @param fieldName le champs sans l'extension + * @param type le type que le champs doit avoir + */ + public ElementField(String fieldName, WikittyTypes type) { + // le separateur entre le type et le champs est le meme que entre + // l'extension et le champs, on utilise la meme methode + super(ALL_EXTENSION + FQ_FIELD_NAME_SEPARATOR + fieldName + FQ_FIELD_NAME_SEPARATOR + type.name()); + } + + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementId.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementId.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementId.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -0,0 +1,49 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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.wikitty.entities; + +/** + * Element qui represente l'Id, vous devez utiliser l'instance + * {@link Element#ID} + * + * @author poussin + * @version $Revision$ + * @since 3.3 + * + * Last update: $Date$ + * by : $Author$ + */ +public class ElementId extends Element { + + private static final long serialVersionUID = 1L; + + public static final String FIELD_ID = "ID"; + + protected ElementId() { + super(FIELD_ID); + } + + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementNode.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementNode.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ElementNode.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -0,0 +1,54 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 CodeLutin, Benjamin Poussin + * %% + * 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.wikitty.entities; + +/** + * Represente un element pour les recherches sur les arbres. Vous devez utiliser + * <li> {@link Element#NODE_BRANCH} utilise pour savoir si un objet est attache a un noeud ou un sous noeud + * <li> {@link Element#NODE_ROOT} utilise pour creer une condition sur le noeud root de l'arbre + * <li> {@link Element#NODE_PARENTS} utilise pour creer une condition sur un noeud ou un de ses peres + * <li> {@link Element#NODE_DEPTH} utilise pour creer une condition sur la profondeur d'un noeud (root=1) + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class ElementNode extends Element { + + private static final long serialVersionUID = 1L; + + public static final String FIELD_NODE_ROOT = "rootNode"; + public static final String FIELD_NODE_PATH = "pathNode"; + public static final String FIELD_NODE_DEPTH = "depthNode"; + + + /** protected because you must used constant defined in {@link Element} */ + protected ElementNode(String v) { + super(v); + } + + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -50,7 +50,6 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.generator.WikittyTransformerUtil; -import org.nuiton.wikitty.query.conditions.Element; /** * Wikitty implementation. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -32,8 +32,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.query.conditions.Condition; -import org.nuiton.wikitty.query.conditions.Element; -import org.nuiton.wikitty.query.conditions.ElementField; +import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.entities.ElementField; /** * Classe permettant de faire des recherches dans les données. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryMaker.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -44,8 +44,8 @@ import org.nuiton.wikitty.query.conditions.ConditionValueString; import org.nuiton.wikitty.query.conditions.ContainsAll; import org.nuiton.wikitty.query.conditions.ContainsOne; -import org.nuiton.wikitty.query.conditions.Element; -import org.nuiton.wikitty.query.conditions.ElementField; +import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.entities.ElementField; import org.nuiton.wikitty.query.conditions.Equals; import org.nuiton.wikitty.query.conditions.False; import org.nuiton.wikitty.query.conditions.Greater; 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-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryParser.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -39,8 +39,8 @@ import org.nuiton.wikitty.query.conditions.ConditionValueString; import org.nuiton.wikitty.query.conditions.ContainsAll; import org.nuiton.wikitty.query.conditions.ContainsOne; -import org.nuiton.wikitty.query.conditions.Element; -import org.nuiton.wikitty.query.conditions.ElementField; +import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.entities.ElementField; import org.nuiton.wikitty.query.conditions.Equals; import org.nuiton.wikitty.query.conditions.False; import org.nuiton.wikitty.query.conditions.Greater; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyClient; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; /** * Represente un resultat de requete {@link WikittyQuery}. Pour caster les Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryVisitorCopy.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -33,7 +33,7 @@ import org.nuiton.wikitty.query.conditions.ConditionValueString; import org.nuiton.wikitty.query.conditions.ContainsAll; import org.nuiton.wikitty.query.conditions.ContainsOne; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.conditions.Equals; import org.nuiton.wikitty.query.conditions.False; import org.nuiton.wikitty.query.conditions.Greater; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Between.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Between.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Between.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; + /** * Between operator is used to build restriction containing "min < element * < max" where element could be a Integer, a Float or a Date. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsAll.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsAll.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsAll.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import java.util.Collection; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsOne.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsOne.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ContainsOne.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import java.util.Collection; /** Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -1,122 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 CodeLutin, Benjamin Poussin - * %% - * 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.wikitty.query.conditions; - -import java.io.Serializable; -import org.apache.commons.lang.ObjectUtils; -import org.nuiton.wikitty.WikittyConstants; - -/** - * Class mere qui determine sur quoi porte une condition. Les classes filles - * possible sont par exemple: ElementField, ElementId, ElementExtension - * - * This class and sub classes must be very simple because this class is used - * in Wikitty interface that GWT used. - * - * @author poussin - * @version $Revision$ - * @since 3.3 - * - * Last update: $Date$ - * by : $Author$ - */ -public class Element implements WikittyConstants, Serializable { - - // serialVersionUID is used for serialization. - private static final long serialVersionUID = 1L; - - /** utilise pour creer une condition sur le noeud root de l'arbre */ - public static final ElementNode NODE_ROOT = new ElementNode(ElementNode.FIELD_NODE_ROOT); - /** utilise pour creer une condition sur un noeud ou un de ses peres (le chemin d'acces a un noeud)*/ - public static final ElementNode NODE_PATH = new ElementNode(ElementNode.FIELD_NODE_PATH); - /** utilise pour creer une condition sur la profondeur d'un noeud (root=1) */ - public static final ElementNode NODE_DEPTH = new ElementNode(ElementNode.FIELD_NODE_DEPTH); - - public static final ElementId ID = new ElementId(); - public static final ElementExtension EXTENSION = new ElementExtension(); - public static final ElementField ALL_FIELD = - new ElementField("*" + FQ_FIELD_NAME_SEPARATOR + "*"); - - protected String value; - - public Element() { - } - - public Element(String value) { - this.value = value; - } - - public static Element get(String v) { - Element result; - if (Element.ID.getValue().equalsIgnoreCase(v)) { - result = Element.ID; - } else if (Element.EXTENSION.getValue().equalsIgnoreCase(v)) { - result = Element.EXTENSION; - } else if (Element.NODE_ROOT.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_ROOT; - } else if (Element.NODE_PATH.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_PATH; - } else if (Element.NODE_DEPTH.getValue().equalsIgnoreCase(v)) { - result = Element.NODE_DEPTH; - } else { - result = new ElementField(v); - } - return result; - } - - public String getValue() { - return value; - } - - @Override - public boolean equals(Object obj) { - boolean result; - - if (this == obj) { - result = true; - } else if (obj == null) { - result = false; - } else if (ObjectUtils.equals(this.getClass(), obj.getClass())) { - Element e = (Element)obj; - result = ObjectUtils.equals(this.getValue(), e.getValue()); - } else { - result = false; - } - return result; - } - - @Override - public int hashCode() { - // a priori, pas de probleme pour utiliser value pour la hash car pas - // moyen de changer sa valeur, une fois l'objet cree - return ObjectUtils.hashCode(this.getValue()); - } - - @Override - public String toString() { - return value; - } - -} Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -1,49 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 CodeLutin, Benjamin Poussin - * %% - * 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.wikitty.query.conditions; - -/** - * Un element qui represente les extensions, vous devez utiliser l'instance - * {@link Element#EXTENSION} - * - * @author poussin - * @version $Revision$ - * @since 3.3 - * - * Last update: $Date$ - * by : $Author$ - */ -public class ElementExtension extends Element { - - private static final long serialVersionUID = 1L; - - public static final String FIELD_EXTENSION = "EXTENSION"; - - protected ElementExtension() { - super(FIELD_EXTENSION); - } - - -} Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -1,82 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 CodeLutin, Benjamin Poussin - * %% - * 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.wikitty.query.conditions; - -import org.nuiton.wikitty.entities.WikittyTypes; - -/** - * Element qui porte sur un champs. Le champs doit-ete de la forme - * extname.fieldname. Mais extname ou fieldname ou les deux peuvent etre - * remplace par des *. Au lieu de faire '*.*' il est preferable d'utiliser - * {@link #ALL_FIELD} - * - * @author poussin - * @version $Revision$ - * @since 3.3 - * - * Last update: $Date$ - * by : $Author$ - */ -public class ElementField extends Element { - - private static final long serialVersionUID = 1L; - - final static public String ALL_EXTENSION = "*"; - - /** - * Le parametre doit etre completement qualifier c-a-d: extName.fieldName. - * ex: User.firstName. - * @param fqfield - */ - public ElementField(String fqfield) { - super(fqfield); - } - - /** - * Ce constructeur permet de creer un champs, si a la place de extensionName - * vous passez {@link #ALL_EXTENSION} le champs represente tous les champs - * partant se nom sur toutes les extensions - * @param extensionName - * @param fieldName - */ - public ElementField(String extensionName, String fieldName) { - super(extensionName + FQ_FIELD_NAME_SEPARATOR + fieldName); - } - - /** - * Cree un champs sur toutes les extensions ex: "*.name" en specifiant le - * type du champs ex: "*.birthday.DATE" - * - * @param fieldName le champs sans l'extension - * @param type le type que le champs doit avoir - */ - public ElementField(String fieldName, WikittyTypes type) { - // le separateur entre le type et le champs est le meme que entre - // l'extension et le champs, on utilise la meme methode - super(ALL_EXTENSION + FQ_FIELD_NAME_SEPARATOR + fieldName + FQ_FIELD_NAME_SEPARATOR + type.name()); - } - - -} Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -1,49 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 CodeLutin, Benjamin Poussin - * %% - * 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.wikitty.query.conditions; - -/** - * Element qui represente l'Id, vous devez utiliser l'instance - * {@link Element#ID} - * - * @author poussin - * @version $Revision$ - * @since 3.3 - * - * Last update: $Date$ - * by : $Author$ - */ -public class ElementId extends Element { - - private static final long serialVersionUID = 1L; - - public static final String FIELD_ID = "ID"; - - protected ElementId() { - super(FIELD_ID); - } - - -} Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -1,54 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 CodeLutin, Benjamin Poussin - * %% - * 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.wikitty.query.conditions; - -/** - * Represente un element pour les recherches sur les arbres. Vous devez utiliser - * <li> {@link Element#NODE_BRANCH} utilise pour savoir si un objet est attache a un noeud ou un sous noeud - * <li> {@link Element#NODE_ROOT} utilise pour creer une condition sur le noeud root de l'arbre - * <li> {@link Element#NODE_PARENTS} utilise pour creer une condition sur un noeud ou un de ses peres - * <li> {@link Element#NODE_DEPTH} utilise pour creer une condition sur la profondeur d'un noeud (root=1) - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class ElementNode extends Element { - - private static final long serialVersionUID = 1L; - - public static final String FIELD_NODE_ROOT = "rootNode"; - public static final String FIELD_NODE_PATH = "pathNode"; - public static final String FIELD_NODE_DEPTH = "depthNode"; - - - /** protected because you must used constant defined in {@link Element} */ - protected ElementNode(String v) { - super(v); - } - - -} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Equals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Equals.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Equals.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.WikittyQueryMaker; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Greater.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Greater.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Greater.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.WikittyQueryMaker; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/GreaterOrEquals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/GreaterOrEquals.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/GreaterOrEquals.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.WikittyQueryMaker; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Keyword.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Keyword.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Keyword.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.ElementField; import org.apache.commons.lang.ClassUtils; import org.nuiton.wikitty.WikittyException; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Less.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Less.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Less.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.WikittyQueryMaker; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/LessOrEquals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/LessOrEquals.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/LessOrEquals.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; + /** * LessOrEqual operator is used to build restriction containing "element <= * value" where element could be a Integer, a Float, a Date, ... (must be comparable) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Like.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Like.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Like.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; + /** * Like is use on String field type, you can use '*' at beginning or ending * to match all char. (ex: ext.field LIKE 'deb*' match 'debut' or 'debout' ... Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotEquals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotEquals.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotEquals.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; + /** * NotEquals operator is used to build restriction containing "element != value" * where element could be an Id, a String, an Integer, a Float, a Date ... Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotNull.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotNull.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/NotNull.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; + /** * Is not null restriction, check if field has value (not null) * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Null.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Null.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Null.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; + /** * Is null restriction, check if field has no value (null) * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Select.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Select.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Select.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.apache.commons.lang.ObjectUtils; /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalBinaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalBinaryOperator.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalBinaryOperator.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.apache.commons.lang.ClassUtils; import org.apache.commons.lang.ObjectUtils; import org.nuiton.wikitty.WikittyException; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalNaryOperator.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import java.util.ArrayList; import java.util.Collection; import java.util.List; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalTernaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalTernaryOperator.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalTernaryOperator.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.apache.commons.lang.ClassUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.logging.Log; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/TerminalUnaryOperator.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Unlike.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Unlike.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Unlike.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -24,6 +24,8 @@ */ package org.nuiton.wikitty.query.conditions; +import org.nuiton.wikitty.entities.Element; + /** * UnLike is use on String field type, you can use '*' at beginning or ending * to match all char. (ex: ext.field UNLIKE 'deb*' not match 'debut' or 'debout' ... Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -41,7 +41,7 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.conditions.Condition; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.conditions.Select; import org.nuiton.wikitty.services.WikittyTransaction; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -64,8 +64,8 @@ import org.nuiton.wikitty.query.conditions.ConditionValueString; import org.nuiton.wikitty.query.conditions.ContainsAll; import org.nuiton.wikitty.query.conditions.ContainsOne; -import org.nuiton.wikitty.query.conditions.ElementExtension; -import org.nuiton.wikitty.query.conditions.ElementId; +import org.nuiton.wikitty.entities.ElementExtension; +import org.nuiton.wikitty.entities.ElementId; import org.nuiton.wikitty.query.conditions.Equals; import org.nuiton.wikitty.query.conditions.Greater; import org.nuiton.wikitty.query.conditions.GreaterOrEquals; @@ -188,7 +188,7 @@ } // create facet field - for (org.nuiton.wikitty.query.conditions.Element e : query.getFacetField()) { + for (org.nuiton.wikitty.entities.Element e : query.getFacetField()) { String fqf = e.getValue(); Object value = w.getFqField(fqf); topic.get(fqf).add(value); @@ -644,7 +644,7 @@ * la valeur du champs */ protected void collectFieldValue( - org.nuiton.wikitty.query.conditions.Element e, + org.nuiton.wikitty.entities.Element e, Map<String, Collection> values) { if (e instanceof ElementId) { values.put(e.getValue(), Collections.singleton(w.getId())); @@ -737,7 +737,7 @@ * @return vrai si le predicat est verifie */ protected boolean check(Predicate predicate, - org.nuiton.wikitty.query.conditions.Element element, Object expected) { + org.nuiton.wikitty.entities.Element element, Object expected) { boolean result = false; Map<String, Collection> fieldValues = new HashMap<String, Collection>(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemoryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemoryTest.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemoryTest.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -40,7 +40,7 @@ import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; /** * Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -112,7 +112,7 @@ addImport(contract, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN); addImport(contract, WikittyTransformerUtil.WIKITTY_CLASS_FQN); addImport(contract, WikittyTransformerUtil.ENTITY_PACKAGE + ".WikittyExtension"); - addImport(contract, "org.nuiton.wikitty.query.conditions.ElementField"); + addImport(contract, "org.nuiton.wikitty.entities.ElementField"); addImport(contract, "org.nuiton.wikitty.WikittyUtil"); addImport(contract, WikittyTransformerUtil.ENTITY_PACKAGE + ".WikittyUser"); addImport(contract, WikittyTransformerUtil.ENTITY_PACKAGE + ".WikittyUserAbstract"); Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -90,6 +90,7 @@ import org.nuiton.wikitty.storage.WikittyStorage; import org.nuiton.wikitty.services.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.WikittyTypes; /** * @@ -176,7 +177,7 @@ } } - protected String getColName(FieldType.TYPE type) { + protected String getColName(WikittyTypes type) { String result; switch(type) { case BINARY: Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -34,11 +34,11 @@ import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyTypes; -import org.nuiton.wikitty.query.conditions.Element; -import org.nuiton.wikitty.query.conditions.ElementExtension; -import org.nuiton.wikitty.query.conditions.ElementField; -import org.nuiton.wikitty.query.conditions.ElementId; -import org.nuiton.wikitty.query.conditions.ElementNode; +import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.entities.ElementExtension; +import org.nuiton.wikitty.entities.ElementField; +import org.nuiton.wikitty.entities.ElementId; +import org.nuiton.wikitty.entities.ElementNode; import org.nuiton.wikitty.services.WikittyTransaction; import org.nuiton.wikitty.storage.WikittyExtensionStorage; Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -40,7 +40,7 @@ import org.nuiton.wikitty.query.conditions.ConditionValueString; import org.nuiton.wikitty.query.conditions.ContainsAll; import org.nuiton.wikitty.query.conditions.ContainsOne; -import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.conditions.Equals; import org.nuiton.wikitty.query.conditions.False; import org.nuiton.wikitty.query.conditions.Greater; Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -75,8 +75,8 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; -import org.nuiton.wikitty.query.conditions.Element; -import org.nuiton.wikitty.query.conditions.ElementField; +import org.nuiton.wikitty.entities.Element; +import org.nuiton.wikitty.entities.ElementField; import org.nuiton.wikitty.query.conditions.Select; import org.nuiton.wikitty.search.Search; import org.nuiton.wikitty.search.TreeNodeResult; Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-13 14:47:08 UTC (rev 1323) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrForQueryTest.java 2012-01-13 15:18:37 UTC (rev 1324) @@ -50,7 +50,7 @@ import org.nuiton.wikitty.query.WikittyQueryParser; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.conditions.Aggregate; -import org.nuiton.wikitty.query.conditions.ElementField; +import org.nuiton.wikitty.entities.ElementField; /** *

1 0

r1323 - trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest
by bpoussin＠users.nuiton.org Jan. 13, 2012

Jan. 13, 2012

Author: bpoussin Date: 2012-01-13 15:47:08 +0100 (Fri, 13 Jan 2012) New Revision: 1323 Url: http://nuiton.org/repositories/revision/wikitty/1323 Log: Anomalie #1901: ElementField in generated entities not usable on GWT Modified: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java Modified: trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java =================================================================== --- trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java 2012-01-13 14:45:32 UTC (rev 1322) +++ trunk/wikitty-perf-test/src/main/java/org/nuiton/wikitty/perftest/PerfTest.java 2012-01-13 14:47:08 UTC (rev 1323) @@ -32,7 +32,7 @@ import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; @@ -62,11 +62,11 @@ WikittyService ws = WikittyServiceFactory.buildWikittyService(config); WikittyProxy proxy = new WikittyProxy(ws); WikittyExtension ext = ExtensionFactory.create("perfTest", "1") - .addField("name", TYPE.STRING).addField("surname", TYPE.STRING) - .addField("age", TYPE.NUMERIC).addField("height", TYPE.NUMERIC) - .addField("birth", TYPE.DATE).addField("wedding", TYPE.DATE) - .addField("isTrue", TYPE.BOOLEAN).addField("isFalse", TYPE.BOOLEAN) - .addField("wiki1", TYPE.WIKITTY).addField("wiki2", TYPE.WIKITTY).extension(); + .addField("name", WikittyTypes.STRING).addField("surname", WikittyTypes.STRING) + .addField("age", WikittyTypes.NUMERIC).addField("height", WikittyTypes.NUMERIC) + .addField("birth", WikittyTypes.DATE).addField("wedding", WikittyTypes.DATE) + .addField("isTrue", WikittyTypes.BOOLEAN).addField("isFalse", WikittyTypes.BOOLEAN) + .addField("wiki1", WikittyTypes.WIKITTY).addField("wiki2", WikittyTypes.WIKITTY).extension(); Random rand = new Random(); List<String> ids = new ArrayList<String>();

1 0

Jan. 13, 2012

Author: bpoussin Date: 2012-01-13 15:45:32 +0100 (Fri, 13 Jan 2012) New Revision: 1322 Url: http://nuiton.org/repositories/revision/wikitty/1322 Log: Anomalie #1901: ElementField in generated entities not usable on GWT - Element est rendu plus simple - extraction de FieldType.TYPE en WikittyTypes - creation d'une interface pour mettre les constantes Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConstants.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -0,0 +1,18 @@ +package org.nuiton.wikitty; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public interface WikittyConstants { + + public static final String FQ_FIELD_NAME_SEPARATOR = "."; + public static final String FQ_FIELD_NAME_SEPARATOR_REGEX = "\\."; + public static final String FQ_META_EXTENSION_SEPARATOR = ":"; + public static final String FQ_META_EXTENSION_SEPARATOR_REGEX = ":"; + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -72,6 +72,7 @@ import org.apache.commons.lang.time.FastDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.generator.WikittyTransformerUtil; /** @@ -82,7 +83,7 @@ * * Last update: $Date$ by : $Author$ */ -public class WikittyUtil { +public class WikittyUtil implements WikittyConstants { /** Pattern que doivent respecter les noms des extensions */ public static final String extensionNamePattern = "\\w+"; @@ -119,12 +120,6 @@ "dd/MM/yy hh:mm", "yyyyMMdd", }; - - public static final String FQ_FIELD_NAME_SEPARATOR = "."; - public static final String FQ_FIELD_NAME_SEPARATOR_REGEX = "\\."; - public static final String FQ_META_EXTENSION_SEPARATOR = ":"; - public static final String FQ_META_EXTENSION_SEPARATOR_REGEX = ":"; - // /** All date format parser used to convert string to date */ // static final protected DateFormat[] parserDateFormats = new DateFormat[] { @@ -181,7 +176,7 @@ static public String parseField(String def, FieldType fieldType) { Matcher match = fieldPattern.matcher(def); if (match.matches()) { - fieldType.setType(FieldType.TYPE.parse(match.group(1))); + fieldType.setType(WikittyTypes.parse(match.group(1))); String name = match.group(2); String lower = match.group(3); if (lower != null) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyException; @@ -176,7 +176,7 @@ } // remove non existant wikitty on Wikitty type field - if (fieldType.getType().equals(TYPE.WIKITTY)) { + if (fieldType.getType().equals(WikittyTypes.WIKITTY)) { // restore works (database) but solr criteria won't Wikitty wikitty = client.restore(multiplesValue); @@ -190,7 +190,7 @@ } } else { // remove non existant wikitty on Wikitty type field - if (fieldType.getType().equals(TYPE.WIKITTY)) { + if (fieldType.getType().equals(WikittyTypes.WIKITTY)) { // restore works (database) but solr criteria won't Wikitty wikitty = client.restore(value); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -29,7 +29,7 @@ import java.util.Map; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; public class ExtensionFactory { @@ -50,7 +50,7 @@ return new ExtensionFactory(name, version); } - public FieldFactory addField(String name, TYPE fieldType) { + public FieldFactory addField(String name, WikittyTypes fieldType) { return new FieldFactory(this, name, fieldType); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldFactory.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldFactory.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -27,24 +27,24 @@ import java.util.HashMap; import java.util.Map; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; public class FieldFactory { protected ExtensionFactory parentFactory; protected String fieldName; - protected TYPE type; + protected WikittyTypes type; protected int minOccur = 0, maxOccur = 1; protected boolean unique = false; protected Map<String, String> tagValues = new HashMap<String, String>(); - public FieldFactory(ExtensionFactory parentFactory, String fieldName, TYPE type) { + public FieldFactory(ExtensionFactory parentFactory, String fieldName, WikittyTypes type) { this.parentFactory = parentFactory; this.fieldName = fieldName; this.type = type; } - public FieldFactory addField(String name, TYPE type) { + public FieldFactory addField(String name, WikittyTypes type) { append(); return parentFactory.addField(name, type); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/FieldType.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -51,25 +51,10 @@ static public String UNIQUE = "unique"; /** tag/value use for not null */ static public String NOT_NULL = "notNull"; - - static public enum TYPE { - BINARY, BOOLEAN, DATE, NUMERIC, STRING, WIKITTY; - /** - * convert string to TYPE, this method accept not trimed and not well - * cased string (difference with valueOf) - * @param name - * @return TYPE else exception is thrown - */ - public static TYPE parse(String name) { - TYPE result = valueOf(name.trim().toUpperCase()); - return result; - } - } - public static final int NOLIMIT = Integer.MAX_VALUE; - protected TYPE type; + protected WikittyTypes type; protected int lowerBound; protected int upperBound; @@ -79,7 +64,7 @@ public FieldType() { } - public FieldType(TYPE type, int lowerBound, int upperBound) { + public FieldType(WikittyTypes type, int lowerBound, int upperBound) { this.type = type; this.lowerBound = lowerBound; this.upperBound = upperBound; @@ -218,11 +203,11 @@ return getValidValue(value) != null; } - public TYPE getType() { + public WikittyTypes getType() { return type; } - public void setType(TYPE type) { + public void setType(WikittyTypes type) { this.type = type; } Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyTypes.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -0,0 +1,22 @@ +package org.nuiton.wikitty.entities; + +/** + * Enumeration de tous les types de champs supporte par Wikitty + * + * @author poussin + */ +public enum WikittyTypes { + BINARY, BOOLEAN, DATE, NUMERIC, STRING, WIKITTY; + + /** + * convert string to TYPE, this method accept not trimed and not well + * cased string (difference with valueOf) + * @param name + * @return TYPE else exception is thrown + */ + public static WikittyTypes parse(String name) { + WikittyTypes result = valueOf(name.trim().toUpperCase()); + return result; + } + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/Element.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -26,13 +26,15 @@ import java.io.Serializable; import org.apache.commons.lang.ObjectUtils; -import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.WikittyConstants; /** * Class mere qui determine sur quoi porte une condition. Les classes filles * possible sont par exemple: ElementField, ElementId, ElementExtension - * * + * This class and sub classes must be very simple because this class is used + * in Wikitty interface that GWT used. + * * @author poussin * @version $Revision$ * @since 3.3 @@ -40,7 +42,7 @@ * Last update: $Date$ * by : $Author$ */ -public class Element implements Serializable { +public class Element implements WikittyConstants, Serializable { // serialVersionUID is used for serialization. private static final long serialVersionUID = 1L; @@ -55,7 +57,7 @@ public static final ElementId ID = new ElementId(); public static final ElementExtension EXTENSION = new ElementExtension(); public static final ElementField ALL_FIELD = - new ElementField("*" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + "*"); + new ElementField("*" + FQ_FIELD_NAME_SEPARATOR + "*"); protected String value; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementExtension.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -24,9 +24,6 @@ */ package org.nuiton.wikitty.query.conditions; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Un element qui represente les extensions, vous devez utiliser l'instance * {@link Element#EXTENSION} @@ -40,9 +37,6 @@ */ public class ElementExtension extends Element { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ElementExtension.class); - private static final long serialVersionUID = 1L; public static final String FIELD_EXTENSION = "EXTENSION"; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementField.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -24,10 +24,7 @@ */ package org.nuiton.wikitty.query.conditions; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.WikittyTypes; /** * Element qui porte sur un champs. Le champs doit-ete de la forme @@ -44,9 +41,6 @@ */ public class ElementField extends Element { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ElementField.class); - private static final long serialVersionUID = 1L; final static public String ALL_EXTENSION = "*"; @@ -68,7 +62,7 @@ * @param fieldName */ public ElementField(String extensionName, String fieldName) { - super(WikittyUtil.getFQFieldName(extensionName, fieldName)); + super(extensionName + FQ_FIELD_NAME_SEPARATOR + fieldName); } /** @@ -78,11 +72,10 @@ * @param fieldName le champs sans l'extension * @param type le type que le champs doit avoir */ - public ElementField(String fieldName, FieldType.TYPE type) { + public ElementField(String fieldName, WikittyTypes type) { // le separateur entre le type et le champs est le meme que entre // l'extension et le champs, on utilise la meme methode - super(WikittyUtil.getFQFieldName( - WikittyUtil.getFQFieldName(ALL_EXTENSION, fieldName), type.name())); + super(ALL_EXTENSION + FQ_FIELD_NAME_SEPARATOR + fieldName + FQ_FIELD_NAME_SEPARATOR + type.name()); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementId.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -24,9 +24,6 @@ */ package org.nuiton.wikitty.query.conditions; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Element qui represente l'Id, vous devez utiliser l'instance * {@link Element#ID} @@ -40,9 +37,6 @@ */ public class ElementId extends Element { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ElementId.class); - private static final long serialVersionUID = 1L; public static final String FIELD_ID = "ID"; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions/ElementNode.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -24,9 +24,6 @@ */ package org.nuiton.wikitty.query.conditions; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Represente un element pour les recherches sur les arbres. Vous devez utiliser * <li> {@link Element#NODE_BRANCH} utilise pour savoir si un objet est attache a un noeud ou un sous noeud @@ -41,9 +38,6 @@ */ public class ElementNode extends Element { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ElementNode.class); - private static final long serialVersionUID = 1L; public static final String FIELD_NODE_ROOT = "rootNode"; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -50,7 +50,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.query.FacetQuery; @@ -356,7 +356,7 @@ boolean result = false; if (values != null && expected.size() > 0) { // gestion des type STRING differement car il peut y avoir des '*' - if (type != null && type.getType() == TYPE.STRING) { + if (type != null && type.getType() == WikittyTypes.STRING) { Iterator i = expected.iterator(); String exp = String.valueOf(i.next()); for (Object fieldValue : values) { @@ -385,7 +385,7 @@ boolean result = false; if (values != null && expected.size() > 0) { // gestion des type STRING differement car il peut y avoir des '*' - if (type != null && type.getType() == TYPE.STRING) { + if (type != null && type.getType() == WikittyTypes.STRING) { Iterator i = expected.iterator(); String exp = String.valueOf(i.next()); for (Object fieldValue : values) { @@ -1341,13 +1341,13 @@ checked = !value.equals(o); break; case ENDS_WITH: - if (t.getType() != TYPE.STRING) { + if (t.getType() != WikittyTypes.STRING) { throw new WikittyException("Can't search for contents that 'ends with' on attribute type different of String. " + "Attribute " + fqfieldName + " is " + t.getType().name()); } checked = ((String) o).endsWith((String) value); break; case STARTS_WITH: - if (t.getType() != TYPE.STRING) { + if (t.getType() != WikittyTypes.STRING) { throw new WikittyException("Can't search for contents that 'starts with' on attribute type different of String. " + "Attribute " + fqfieldName + " is " + t.getType().name()); } checked = ((String) o).startsWith((String) value); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -31,7 +31,7 @@ import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; @@ -47,7 +47,7 @@ WikittyService ws = WikittyServiceFactory.buildWikittyService( config); WikittyProxy proxy = new WikittyProxy(ws); - WikittyExtension ext = ExtensionFactory.create("test", "1").addField("toto", TYPE.NUMERIC).extension(); + WikittyExtension ext = ExtensionFactory.create("test", "1").addField("toto", WikittyTypes.NUMERIC).extension(); Wikitty w = new WikittyImpl(); String id = w.getId(); w.addExtension(ext); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractSearchTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -53,6 +53,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.nuiton.wikitty.entities.WikittyTypes; /** * User: couteau @@ -84,16 +85,16 @@ //Create product extension WikittyExtension product = ExtensionFactory.create(EXT_PRODUCT, VERSION) - .addField(PRODUCT_PRICE, FieldType.TYPE.NUMERIC) - .addField(PRODUCT_NAME, FieldType.TYPE.STRING) - .addField(PRODUCT_CATEGORY, FieldType.TYPE.WIKITTY) - .addField(PRODUCT_COLOR, FieldType.TYPE.STRING).maxOccur(Integer.MAX_VALUE) + .addField(PRODUCT_PRICE, WikittyTypes.NUMERIC) + .addField(PRODUCT_NAME, WikittyTypes.STRING) + .addField(PRODUCT_CATEGORY, WikittyTypes.WIKITTY) + .addField(PRODUCT_COLOR, WikittyTypes.STRING).maxOccur(Integer.MAX_VALUE) .extension(); proxy.storeExtension(product); //Create category extension WikittyExtension category = ExtensionFactory.create(EXT_CATEGORY, VERSION) - .addField(CATEGORY_NAME, FieldType.TYPE.STRING) + .addField(CATEGORY_NAME, WikittyTypes.STRING) .extension(); proxy.storeExtension(category); @@ -1157,12 +1158,12 @@ assertPagedResultSizeEquals(2, pagedResult); } { - Criteria criteria = Search.query().eq("Category.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); + Criteria criteria = Search.query().eq("Category.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "HardWare").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().eq("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); + Criteria criteria = Search.query().eq("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "HardWare").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); assertPagedResultSizeEquals(2, pagedResult); } @@ -1189,12 +1190,12 @@ assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); + Criteria criteria = Search.query().eq(CategoryEntity.FQ_FIELD_CATEGORYENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "HardWare").criteria(); PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().eq("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "HardWare").criteria(); + Criteria criteria = Search.query().eq("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "HardWare").criteria(); PagedResult<CategoryEntity> pagedResult = proxy.findAllByCriteria(CategoryEntity.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } @@ -1221,12 +1222,12 @@ assertPagedResultSizeEquals(2, pagedResult); } { - Criteria criteria = Search.query().contains("Product.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); + Criteria criteria = Search.query().contains("Product.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "Red").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().contains("*.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); + Criteria criteria = Search.query().contains("*.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "Red").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); assertPagedResultSizeEquals(2, pagedResult); } @@ -1253,12 +1254,12 @@ assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_COLORS + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); + Criteria criteria = Search.query().contains(ProductEntity.FQ_FIELD_PRODUCTENTITY_COLORS + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "Red").criteria(); PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().contains("*.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "Red").criteria(); + Criteria criteria = Search.query().contains("*.colors" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "Red").criteria(); PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } @@ -1285,12 +1286,12 @@ assertPagedResultSizeEquals(2, pagedResult); } { - Criteria criteria = Search.query().like("Product.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); + Criteria criteria = Search.query().like("Product.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "*Blue").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().like("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); + Criteria criteria = Search.query().like("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "*Blue").criteria(); PagedResult<Wikitty> pagedResult = proxy.findAllByCriteria(criteria); assertPagedResultSizeEquals(2, pagedResult); } @@ -1317,12 +1318,12 @@ assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); + Criteria criteria = Search.query().like(ProductEntity.FQ_FIELD_PRODUCTENTITY_NAME + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "*Blue").criteria(); PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } { - Criteria criteria = Search.query().like("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + FieldType.TYPE.STRING, "*Blue").criteria(); + Criteria criteria = Search.query().like("*.name" + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + WikittyTypes.STRING, "*Blue").criteria(); PagedResult<ProductEntity> pagedResult = proxy.findAllByCriteria(ProductEntity.class, criteria); assertPagedResultSizeEquals(1, pagedResult); } @@ -1418,7 +1419,7 @@ String sortableExtName = "sortable"; String numFieldName = "num"; WikittyExtension sortable = ExtensionFactory.create(sortableExtName, "1.0") - .addField(numFieldName, FieldType.TYPE.NUMERIC) + .addField(numFieldName, WikittyTypes.NUMERIC) .extension(); proxy.storeExtension(sortable); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -39,7 +39,7 @@ import org.junit.Test; import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTreeNodeAbstract; import org.nuiton.wikitty.entities.Wikitty; @@ -110,9 +110,9 @@ // test data ... String testExtName = "testExt"; ext = ExtensionFactory.create(testExtName, "1") - .addField("fieldName0", TYPE.NUMERIC) - .addField("fieldName1", TYPE.STRING) - .addField("fieldName2", TYPE.NUMERIC) + .addField("fieldName0", WikittyTypes.NUMERIC) + .addField("fieldName1", WikittyTypes.STRING) + .addField("fieldName2", WikittyTypes.NUMERIC) .extension(); Wikitty w = new WikittyImpl(); Assert.assertFalse( w.hasExtension(testExtName) ); @@ -126,11 +126,11 @@ // test add an other extension ... WikittyExtension ext2 = ExtensionFactory.create("otherExt", "1") - .addField("fieldName0", TYPE.NUMERIC) - .addField("fieldName1", TYPE.STRING) - .addField("fieldName2", TYPE.NUMERIC) - .addField("fieldName3", TYPE.NUMERIC) - .addField("fieldName4", TYPE.NUMERIC) + .addField("fieldName0", WikittyTypes.NUMERIC) + .addField("fieldName1", WikittyTypes.STRING) + .addField("fieldName2", WikittyTypes.NUMERIC) + .addField("fieldName3", WikittyTypes.NUMERIC) + .addField("fieldName4", WikittyTypes.NUMERIC) .extension(); w.addExtension(ext2); @@ -174,14 +174,14 @@ @Test public void testWikittyExtensionCorrectFieldName() throws Exception { ExtensionFactory.create("correctExtension", "1") - .addField("correctFieldName", TYPE.NUMERIC).extension(); + .addField("correctFieldName", WikittyTypes.NUMERIC).extension(); } // Throw IllegalArgumentException because invalid character in field name @Test(expected = IllegalArgumentException.class) public void testWikittyExtensionIncorrectFieldName() throws Exception { ExtensionFactory.create("incorrectExtension", "1") - .addField("incorrectFieldName#", TYPE.NUMERIC).extension(); + .addField("incorrectFieldName#", WikittyTypes.NUMERIC).extension(); } @Test @@ -228,7 +228,7 @@ private Wikitty createBasicWikitty() { WikittyExtension ext = ExtensionFactory.create(StorageTest.EXTNAME, "1") - .addField("name", TYPE.STRING) + .addField("name", WikittyTypes.STRING) .extension(); Wikitty w = new WikittyImpl(); w.addExtension(ext); @@ -266,7 +266,7 @@ public void testFieldBoundsManagement() throws Exception { String fieldName = "fieldName0"; WikittyExtension ext = ExtensionFactory.create(StorageTest.EXTNAME, "1") - .addField(fieldName, TYPE.NUMERIC) + .addField(fieldName, WikittyTypes.NUMERIC) .maxOccur(FieldType.NOLIMIT) .extension(); Wikitty w = new WikittyImpl(); @@ -447,8 +447,8 @@ public void testGeneratedExtensionType() { WikittyExtension wikittyExtension = WikittyTreeNodeAbstract.extensionWikittyTreeNode; - Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT).getType()); - Assert.assertEquals(TYPE.STRING, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME).getType()); - Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT).getType()); + Assert.assertEquals(WikittyTypes.WIKITTY, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT).getType()); + Assert.assertEquals(WikittyTypes.STRING, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME).getType()); + Assert.assertEquals(WikittyTypes.WIKITTY, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT).getType()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -28,7 +28,7 @@ import org.junit.Test; import org.nuiton.wikitty.entities.ExtensionFactory; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.WikittyExtension; public class ExtensionFactoryTest { @@ -36,26 +36,26 @@ @Test public void testExtensionFactory() throws Exception { WikittyExtension ext = ExtensionFactory.create("testExtension", "1.0") - .addField("name", TYPE.STRING) + .addField("name", WikittyTypes.STRING) .notNull() - .addField("phoneNumbers", TYPE.STRING) + .addField("phoneNumbers", WikittyTypes.STRING) .minOccur(2) .maxOccur(10) - .addField("matricule", TYPE.NUMERIC) + .addField("matricule", WikittyTypes.NUMERIC) .unique() - .addField("fired", TYPE.BOOLEAN) + .addField("fired", WikittyTypes.BOOLEAN) .extension(); Assert.assertEquals("testExtension", ext.getName()); Assert.assertEquals("1.0", ext.getVersion()); - checkField( ext, "name", TYPE.STRING, 0, 1, false, true); - checkField( ext, "phoneNumbers", TYPE.STRING, 2, 10, false, false); - checkField( ext, "matricule", TYPE.NUMERIC, 0, 1, true, false); - checkField( ext, "fired", TYPE.BOOLEAN, 0, 1, false, false); + checkField( ext, "name", WikittyTypes.STRING, 0, 1, false, true); + checkField( ext, "phoneNumbers", WikittyTypes.STRING, 2, 10, false, false); + checkField( ext, "matricule", WikittyTypes.NUMERIC, 0, 1, true, false); + checkField( ext, "fired", WikittyTypes.BOOLEAN, 0, 1, false, false); } - private void checkField( WikittyExtension ext, String fieldName, TYPE type, + private void checkField( WikittyExtension ext, String fieldName, WikittyTypes type, int min, int max, boolean unique, boolean notNull) { FieldType fieldType = ext.getFieldType(fieldName); String str = "Checking " + ext.getName() + "." + fieldName + " field..."; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -37,7 +37,7 @@ import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; @@ -61,9 +61,9 @@ public static final WikittyExtension EXT_TEST = createExtension(EXTNAME, null, - createType(TYPE.STRING, 0, 1), - createType(TYPE.NUMERIC, 1, 1), - createType(TYPE.DATE, 1, 1) + createType(WikittyTypes.STRING, 0, 1), + createType(WikittyTypes.NUMERIC, 1, 1), + createType(WikittyTypes.DATE, 1, 1) ); private WikittyService ws; @@ -90,7 +90,7 @@ } - protected static FieldType createType( TYPE type, int lower, int upper ) { + protected static FieldType createType( WikittyTypes type, int lower, int upper ) { FieldType fieldType = new FieldType(type, lower, upper); return fieldType; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -43,6 +43,7 @@ import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.entities.WikittyTypes; /** * This class is NOT a test. It's a benchlark that @@ -86,7 +87,7 @@ protected void testPerformanceWikitty(int fieldSize) { WikittyExtension extension = new WikittyExtension("Performance" + fieldSize); for (int i = 0; i < fieldSize; i++) { - FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 1, 1); + FieldType fieldType = new FieldType(WikittyTypes.STRING, 1, 1); extension.addField("field" + i, fieldType); } ws.storeExtension(null, Arrays.asList(extension)); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -37,7 +37,7 @@ import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; @@ -87,9 +87,9 @@ @Test public void testSearch2() throws Exception { WikittyExtension ext = ExtensionFactory.create("testExt", "1") - .addField("name", TYPE.STRING) - .addField("age", TYPE.NUMERIC) - .addField("birth", TYPE.DATE) + .addField("name", WikittyTypes.STRING) + .addField("age", WikittyTypes.NUMERIC) + .addField("birth", WikittyTypes.DATE) .extension(); List<Wikitty> wikitties = new LinkedList<Wikitty>(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -26,7 +26,7 @@ import org.junit.Before; import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; @@ -58,7 +58,7 @@ @Before public void setUp() throws Exception { extension = ExtensionFactory.create(EXT_NAME, "1") - .addField(FIELD_NAME, TYPE.STRING) + .addField(FIELD_NAME, WikittyTypes.STRING) .extension(); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -51,6 +51,7 @@ import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.WikittyTypes; /** test {@link org.nuiton.wikitty.services.WikittyServiceSecurity}. */ public class WikittyServiceSecurityTest extends AbstractWikittyServiceTest { @@ -276,7 +277,7 @@ @Test public void checkWriterRightOnExtension() { - FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 0, 1); + FieldType fieldType = new FieldType(WikittyTypes.STRING, 0, 1); service.restoreExtensionLastVersion(writerToken, extension.getName()); extension.addField("new_field", fieldType); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -39,7 +39,7 @@ import org.junit.Test; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyConfigOption; @@ -83,9 +83,9 @@ wikittyService = new WikittyServiceInMemory(config); String extName = "MyExtName"; WikittyExtension ext = ExtensionFactory.create("MyExtName", "1") - .addField("fieldName0", TYPE.NUMERIC) - .addField("fieldName1", TYPE.NUMERIC) - .addField("fieldName2", TYPE.DATE) + .addField("fieldName0", WikittyTypes.NUMERIC) + .addField("fieldName1", WikittyTypes.NUMERIC) + .addField("fieldName2", WikittyTypes.DATE) .extension(); Date date = dateFormater.parse( "30/01/2009" ); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrInputDocument; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; @@ -128,7 +128,7 @@ Collection<String> att = SolrUtil.getStringFieldValues(doc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); remove(id, att); } @@ -140,7 +140,7 @@ Collection<String> att = SolrUtil.getStringFieldValues(doc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); remove(id, att); } @@ -180,7 +180,7 @@ Collection<String> att = SolrUtil.getStringFieldValues(doc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); add(id, att); } @@ -197,7 +197,7 @@ Collection<String> att = SolrUtil.getStringFieldValues(doc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); if (att != null) { for (String attId : att) { if (restriction.contains(attId)) { @@ -216,7 +216,7 @@ Collection<String> att = SolrUtil.getStringFieldValues(doc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); add(id, att); } Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/ElementModifier.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -31,8 +31,9 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.query.conditions.Element; import org.nuiton.wikitty.query.conditions.ElementExtension; import org.nuiton.wikitty.query.conditions.ElementField; @@ -133,7 +134,7 @@ // utile pour force la recherche sur les bons champs lorsqu'on // demande une recherche sur * == #all String fieldNameType = searchField[2]; - TYPE type = FieldType.TYPE.valueOf(fieldNameType); + WikittyTypes type = WikittyTypes.valueOf(fieldNameType); // Ajout du pattern solr pour discriminer le champs ex : _s, _dt, _w, ... modifier = SolrUtil.getSolrFieldName("", type); } @@ -190,7 +191,7 @@ log.debug(ext.toDefinition() + " for " + fieldName); } if (fieldType != null) { // type can be null if extension version differ - TYPE type = fieldType.getType(); + WikittyTypes type = fieldType.getType(); result = SolrUtil.getSolrFieldName(result, type); } else { // on ne retrouve pas le champs, on le laisse comme il est Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -28,8 +28,9 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.operators.Element; import org.nuiton.wikitty.services.WikittyTransaction; @@ -92,7 +93,7 @@ // On passe ici, si on indique dans le champs son type (ex: *.monfield.NUMERIC) // utile pour force la recherche sur les bons champs lorsqu'on demande une recherche sur * == #all String fieldNameType = searchField[2]; - TYPE type = FieldType.TYPE.valueOf(fieldNameType); + WikittyTypes type = WikittyTypes.valueOf(fieldNameType); // Ajout du pattern solr pour discriminer le champs ex : _s, _dt, _w, ... // FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field // result = SolrUtil.getSolrCollectionFieldName(result, type); @@ -120,7 +121,7 @@ log.debug(ext.toDefinition() + " for " + fieldName); } if (fieldType != null) { // type can be null if extension version differ - TYPE type = fieldType.getType(); + WikittyTypes type = fieldType.getType(); // FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field // if (fieldType.isCollection()) { // result = SolrUtil.getSolrCollectionFieldName(result, type); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -34,7 +34,7 @@ import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.nuiton.wikitty.WikittyException; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import java.util.Collection; import java.util.HashMap; @@ -44,6 +44,7 @@ import org.nuiton.util.TimeLog; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.WikittyTypes; import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SOLR_ID; // FIXME REMOVE IT if search on multivalued work with new hack (specific sortable field @@ -161,7 +162,7 @@ static public Map<String, SolrDocument> findAllByAttachment( SolrServer solrServer, Collection<String> ids) { String solrField = SolrUtil.getSolrFieldName( - WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, TYPE.WIKITTY); + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, WikittyTypes.WIKITTY); Map<String, SolrDocument> result = findAllByField(solrServer, solrField, ids); return result; } @@ -239,7 +240,7 @@ * @param type of field * @return field name */ - static public String getSolrFieldName(String fqfieldName, TYPE type) { + static public String getSolrFieldName(String fqfieldName, WikittyTypes type) { String result = fqfieldName; if (type != null) { switch (type) { @@ -386,7 +387,7 @@ } static public Collection<String> getStringFieldValues ( - SolrDocument d, String fieldname, FieldType.TYPE type) { + SolrDocument d, String fieldname, WikittyTypes type) { // petit hack, car la methode retourne un Collection<Object> alors // qu'il sagit en fait d'un Collection<String>, de cette facon on force // la conversion en passant par une colleciton non typee @@ -397,7 +398,7 @@ } static public Collection<String> getStringFieldValues ( - SolrInputDocument d, String fieldname, FieldType.TYPE type) { + SolrInputDocument d, String fieldname, WikittyTypes type) { // petit hack, car la methode retourne un Collection<Object> alors // qu'il sagit en fait d'un Collection<String>, de cette facon on force // la conversion en passant par une colleciton non typee @@ -426,7 +427,7 @@ * @return */ static public String getStringFieldValue( - SolrInputDocument d, String fieldname, FieldType.TYPE type) { + SolrInputDocument d, String fieldname, WikittyTypes type) { String solrFieldName = SolrUtil.getSolrFieldName(fieldname, type); Object value = d.getFieldValue(solrFieldName); @@ -452,7 +453,7 @@ * @param type optional type to generate solr field name * @return */ - static public String getStringFieldValue(SolrDocument d, String fieldname, FieldType.TYPE type) { + static public String getStringFieldValue(SolrDocument d, String fieldname, WikittyTypes type) { String solrFieldName = SolrUtil.getSolrFieldName(fieldname, type); Object value = d.getFieldValue(solrFieldName); @@ -478,7 +479,7 @@ * @param type optional type to generate solr field name * @return */ - static public Integer getIntFieldValue(SolrDocument d, String fieldname, FieldType.TYPE type) { + static public Integer getIntFieldValue(SolrDocument d, String fieldname, WikittyTypes type) { String solrFieldName = SolrUtil.getSolrFieldName(fieldname, type); Object value = d.getFieldValue(solrFieldName); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -50,7 +50,7 @@ import org.apache.solr.core.CoreContainer; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.Wikitty; @@ -264,7 +264,7 @@ Collection<String> oldAtt = SolrUtil.getStringFieldValues( oldDoc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); // il faut supprimer l'indexation arbre des noeuds // qui sont dans old, mais pas dans new Set<String> toRemove = new HashSet<String>(); @@ -431,7 +431,7 @@ SolrInputDocument newDoc = new SolrInputDocument(); String field = SolrUtil.getSolrFieldName( WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); SolrUtil.copySolrDocumentExcludeSomeField(doc, newDoc, field); Collection<String> atts = SolrUtil.getStringFieldValues(doc, field); // remove deleted attachment @@ -444,7 +444,7 @@ newAtts = null; } - addToIndexDocument(newDoc, TYPE.WIKITTY, field, newAtts, true); + addToIndexDocument(newDoc, WikittyTypes.WIKITTY, field, newAtts, true); solrResource.addDoc(id, newDoc); } } @@ -536,7 +536,7 @@ } else { nextParentId = SolrUtil.getStringFieldValue(parentDoc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); } } else { SolrDocument oldParentDoc = tree.get(parentId); @@ -551,7 +551,7 @@ } else { nextParentId = SolrUtil.getStringFieldValue(oldParentDoc, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); } } } @@ -894,7 +894,7 @@ String parentId = SolrUtil.getStringFieldValue(d, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); int nb = counts.containsKey(id) ? counts.get(id) : 0; WikittyQueryResultTreeNode<String> child = new WikittyQueryResultTreeNode<String>(id, nb); @@ -931,7 +931,7 @@ * Ajoute un champs dans un document a indexer */ protected void addToIndexDocument(SolrInputDocument doc, - TYPE type, String fqfieldName, Object fieldValue, + WikittyTypes type, String fqfieldName, Object fieldValue, boolean collection) { if (fqfieldName.startsWith(SOLR_WIKITTY_PREFIX)) { doc.remove(fqfieldName); @@ -1000,7 +1000,7 @@ * @param fqfieldName field to index */ protected void addToIndexDocument(SolrInputDocument doc, Wikitty w, String fqfieldName) { - TYPE type = null; + WikittyTypes type = null; Object fieldValue; boolean collection = false; if (SOLR_ID.equals(fqfieldName)) { @@ -1108,7 +1108,7 @@ if (hasSelect) { // Limit on wikitty - String selectWikitty = SolrUtil.getSolrFieldName(select, TYPE.WIKITTY); + String selectWikitty = SolrUtil.getSolrFieldName(select, WikittyTypes.WIKITTY); criteria.addFacetField(selectWikitty); // We need no result, just facet @@ -1309,7 +1309,7 @@ String parentId = SolrUtil.getStringFieldValue(d, WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, - TYPE.WIKITTY); + WikittyTypes.WIKITTY); int nb = counts.containsKey(id) ? counts.get(id) : 0; TreeNodeResult<String> child = new TreeNodeResult<String>(id, nb); allTreeNodeResult.put(id, child); Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -44,7 +44,7 @@ import org.junit.Test; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; import org.nuiton.wikitty.entities.Wikitty; @@ -90,7 +90,7 @@ */ private void createBasicWikitty() { extension = ExtensionFactory.create("test", "1") - .addField("name", TYPE.STRING) + .addField("name", WikittyTypes.STRING) .extension(); ws.storeExtension(null, Arrays.asList(extension)); } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2012-01-13 08:40:20 UTC (rev 1321) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/AbstractWikittyEditAction.java 2012-01-13 14:45:32 UTC (rev 1322) @@ -39,7 +39,7 @@ import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyTypes; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; @@ -89,7 +89,7 @@ // Patch to handle string collection if (ftype.isCollection() - && ftype.getType() == TYPE.STRING + && ftype.getType() == WikittyTypes.STRING && value != null) { String valueString = value.toString();

1 0

r1321 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by jcouteau＠users.nuiton.org Jan. 13, 2012

Jan. 13, 2012

Author: jcouteau Date: 2012-01-13 09:40:20 +0100 (Fri, 13 Jan 2012) New Revision: 1321 Url: http://nuiton.org/repositories/revision/wikitty/1321 Log: Fix wrong cast Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-12 20:00:00 UTC (rev 1320) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-13 08:40:20 UTC (rev 1321) @@ -1388,7 +1388,7 @@ } else if (first instanceof BusinessEntityImpl) { // BusinessEntityImpl, il faut recuperer les wikitty result = new ArrayList<E>(objects.size()); - for (BusinessEntityImpl e : (WikittyQueryResult<BusinessEntityImpl>)objects) { + for (BusinessEntityImpl e : (List<BusinessEntityImpl>)objects) { result.add((E)e.getWikitty()); } } else if (first instanceof BusinessEntity) {

1 0

r1320 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty: . addons addons/importexport query services
by bpoussin＠users.nuiton.org Jan. 12, 2012

Jan. 12, 2012

Author: bpoussin Date: 2012-01-12 21:00:00 +0100 (Thu, 12 Jan 2012) New Revision: 1320 Url: http://nuiton.org/repositories/revision/wikitty/1320 Log: Evolution #1867: Delete all deprecated API (criteria, ...) suppression de l'utilisation partout ou c'est possible Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportMethod.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceHook.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -123,6 +123,16 @@ * @param wikittyService */ public WikittyClient(ApplicationConfig config, WikittyService wikittyService) { + this(config, wikittyService, null); + } + + /** + * Creation du client en forcant le wikittyService + * + * @param config + * @param wikittyService + */ + public WikittyClient(ApplicationConfig config, WikittyService wikittyService, String securityToken) { if (config != null) { this.config = config; long timeToLogInfo = config.getOptionAsInt(WikittyConfigOption. @@ -134,6 +144,7 @@ } setWikittyService(wikittyService); + setSecurityToken(securityToken); } static public TimeLog getTimeTrace() { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nUtil.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nUtil.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyI18n; @@ -55,7 +56,9 @@ * @param proxy * @param extension * @return + * @deprecated since 3.4 use {@link #getI18n(org.nuiton.wikitty.WikittyClient, org.nuiton.wikitty.entities.WikittyExtension) } */ + @Deprecated static public WikittyI18n getI18n(WikittyProxy proxy, WikittyExtension extension) { String id = WikittyMetaExtensionUtil.generateId( WikittyI18n.EXT_WIKITTYI18N, @@ -71,4 +74,26 @@ return result; } + /** + * Create or load WikittyExtensionTranslation for given extension. + * If created you must call store if you want keep it in storage + * @param proxy + * @param extension + * @return + */ + static public WikittyI18n getI18n(WikittyClient proxy, WikittyExtension extension) { + String id = WikittyMetaExtensionUtil.generateId( + WikittyI18n.EXT_WIKITTYI18N, + extension.getName()); + + WikittyI18n result; + Wikitty w = proxy.restore(id); + if (w == null) { + w = new WikittyImpl(id); + } + result = new WikittyI18nImpl(w); + + return result; + } + } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -40,12 +40,14 @@ import java.util.concurrent.Future; import java.util.concurrent.FutureTask; import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyConfigOption; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.addons.importexport.ExportQueryTask; import org.nuiton.wikitty.addons.importexport.ExportTask; import org.nuiton.wikitty.addons.importexport.ImportExportCSV; @@ -53,6 +55,8 @@ import org.nuiton.wikitty.addons.importexport.ImportExportXML; import org.nuiton.wikitty.addons.importexport.ImportTask; import org.nuiton.wikitty.addons.importexport.JobState; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.search.Search; /** @@ -81,7 +85,7 @@ } }; - ApplicationConfig config = null; + WikittyClient client; /** directory path where export asynchronous file are stored */ protected String exportDirectory = "/tmp/"; /** url used by client to retrieve export file when job is ended */ @@ -94,28 +98,41 @@ protected Map<String, Future<String>> importExportTask = new HashMap<String, Future<String>>(); - protected WikittyService ws; - protected String securityToken; - public WikittyImportExportService( - ApplicationConfig config, String securityToken, WikittyService ws) { - this.config = config; - this.securityToken = securityToken; - this.ws = ws; + public WikittyImportExportService(WikittyClient client) { + this.client = client; + ApplicationConfig config = client.getConfig(); exportDirectory = config.getOption( WikittyConfigOption.WIKITTY_EXPORT_DIRECTORY.getKey()); exportPublicURL = config.getOption( WikittyConfigOption.WIKITTY_EXPORT_PUBLICURL.getKey()); - + int maxThread = config.getOptionAsInt( WikittyConfigOption.WIKITTY_EXPORT_THREADNUMBER.getKey()); this.importExportExecutor = Executors.newFixedThreadPool(maxThread); } + /** + * + * @param config + * @param securityToken + * @param ws + * @deprecated since 3.2 use {@link #WikittyImportExportService(org.nuiton.wikitty.WikittyClient) } + */ + @Deprecated + public WikittyImportExportService( + ApplicationConfig config, String securityToken, WikittyService ws) { + this(new WikittyClient(config, ws, securityToken)); + } + + public WikittyClient getClient() { + return client; + } + public WikittyService getWikittyService() { - return ws; + return getClient().getWikittyService(); } public String getExportDirectory() { @@ -132,7 +149,7 @@ } public void syncImport(FORMAT format, Reader reader) { - ImportTask task = new ImportTask(securityToken, config, ws, format, reader); + ImportTask task = new ImportTask(client, format, reader); task.run(); } @@ -140,7 +157,7 @@ try { URL url = new URL(uri); Reader reader = new InputStreamReader(url.openStream()); - ImportTask task = new ImportTask(securityToken, config, ws, format, reader); + ImportTask task = new ImportTask(client, format, reader); task.run(); } catch (Exception eee) { throw new WikittyException(String.format( @@ -152,7 +169,7 @@ try { URL url = new URL(uri); Reader reader = new InputStreamReader(url.openStream()); - ImportTask task = new ImportTask(securityToken, config, ws, format, reader); + ImportTask task = new ImportTask(client, format, reader); FutureTask<String> future = new FutureTask<String>(task, null); importExportExecutor.submit(future); @@ -173,8 +190,8 @@ * @return job id */ public String asyncExportAllByExample(FORMAT format, BusinessEntityImpl e) { - Criteria criteria = Search.query(e.getWikitty()).criteria(); - String result = asyncExportAllByCriteria(format, criteria); + WikittyQuery query = new WikittyQueryMaker().wikitty(e).end(); + String result = asyncExportAllByQuery(format, query); return result; } @@ -186,8 +203,8 @@ * @return export string */ public String syncExportAllByExample(FORMAT format, BusinessEntityImpl e) { - Criteria criteria = Search.query(e.getWikitty()).criteria(); - String result = syncExportAllByCriteria(format, criteria); + WikittyQuery query = new WikittyQueryMaker().wikitty(e).end(); + String result = syncExportAllByQuery(format, query); return result; } @@ -200,17 +217,70 @@ */ public void syncExportAllByExample(FORMAT format, BusinessEntityImpl e, Writer writer) { - Criteria criteria = Search.query(e.getWikitty()).criteria(); - syncExportAllByCriteria(format, criteria, writer); + WikittyQuery query = new WikittyQueryMaker().wikitty(e).end(); + syncExportAllByQuery(format, query, writer); } /** * Asynchronous export by criteria. * * @param format export format + * @param query criteria + * @return export as string + */ + public String asyncExportAllByQuery(FORMAT format, WikittyQuery query) { + try { + String jobId = UUID.randomUUID().toString(); + + File file = new File(exportDirectory, jobId); + String url = exportPublicURL + jobId; + Writer result = new FileWriter(file); + ExportQueryTask task = new ExportQueryTask(client, format, query, result); + FutureTask<String> future = new FutureTask<String>(task, url); + importExportExecutor.submit(future); + + importExportTask.put(jobId, future); + return jobId; + } catch (Exception eee) { + throw new WikittyException(String.format( + "Can't export in format %s", format), eee); + } + } + + /** + * Synchronous export by criteria. + * + * @param format export format + * @param query criteria + * @return export as string + */ + public String syncExportAllByQuery(FORMAT format, WikittyQuery query) { + StringWriter result = new StringWriter(); + syncExportAllByQuery(format, query, result); + return result.toString(); + } + + /** + * Synchronous export by criteria. + * + * @param format export format + * @param query criteria + * @return export as string + */ + public void syncExportAllByQuery(FORMAT format, WikittyQuery query, Writer writer) { + ExportQueryTask task = new ExportQueryTask(client, format, query, writer); + task.run(); + } + + /** + * Asynchronous export by criteria. + * + * @param format export format * @param criteria criteria * @return export as string + * @deprecated since 3.4 user {@link #asyncExportAllByQuery(org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT, org.nuiton.wikitty.query.WikittyQuery) } */ + @Deprecated public String asyncExportAllByCriteria(FORMAT format, Criteria criteria) { try { String jobId = UUID.randomUUID().toString(); @@ -218,8 +288,8 @@ File file = new File(exportDirectory, jobId); String url = exportPublicURL + jobId; Writer result = new FileWriter(file); - ExportTask task = new ExportTask( - securityToken, ws, format, criteria, result); + ExportTask task = new ExportTask(client.getSecurityToken(), + client.getWikittyService(), format, criteria, result); FutureTask<String> future = new FutureTask<String>(task, url); importExportExecutor.submit(future); @@ -233,11 +303,13 @@ /** * Synchronous export by criteria. - * + * * @param format export format * @param criteria criteria * @return export as string + * @deprecated since 3.4 user {@link #syncExportAllByQuery(org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT, org.nuiton.wikitty.query.WikittyQuery) } */ + @Deprecated public String syncExportAllByCriteria(FORMAT format, Criteria criteria) { StringWriter result = new StringWriter(); syncExportAllByCriteria(format, criteria, result); @@ -250,10 +322,12 @@ * @param format export format * @param criteria criteria * @return export as string + * @deprecated since 3.4 user {@link #syncExportAllByQuery(org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT, org.nuiton.wikitty.query.WikittyQuery, java.io.Writer) } */ + @Deprecated public void syncExportAllByCriteria(FORMAT format, Criteria criteria, Writer writer) { - ExportTask task = new ExportTask( - securityToken, ws, format, criteria, writer); + ExportTask task = new ExportTask(client.getSecurityToken(), + client.getWikittyService(), format, criteria, writer); task.run(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -28,14 +28,19 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.entities.WikittyLabelImpl; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.WikittyLabel; +import org.nuiton.wikitty.query.conditions.Element; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; /** @@ -85,7 +90,9 @@ * @param proxy * @param wikittyId object'id * @param label label to add + * @deprecated since 3.4 use {@link #addLabel(org.nuiton.wikitty.WikittyClient, java.lang.String, java.lang.String) } */ + @Deprecated static public void addLabel(WikittyProxy proxy, String wikittyId, String label) { Wikitty w = proxy.restore(wikittyId); WikittyLabelImpl l = new WikittyLabelImpl(w); @@ -94,6 +101,25 @@ } /** + * Add new lable to the wikitty object. You must only used this method, if + * you don't have the Wikitty Object because this method restore and save + * version in WikittyService. If you have Wikitty present in your space, your + * wikitty become obsolete and you lose your change :( + * + * If you have wikitty or business entity you must used {@link #} + * + * @param client + * @param wikittyId object'id + * @param label label to add + */ + static public void addLabel(WikittyClient client, String wikittyId, String label) { + Wikitty w = client.restore(wikittyId); + WikittyLabelImpl l = new WikittyLabelImpl(w); + l.addLabels(label); + client.store(l); + } + + /** * Recherche tous les objets qui ont ce label * * @param proxy @@ -101,7 +127,9 @@ * @param firstIndex * @param endIndex * @return + * @deprecated since 3.4 use {@link #findAllByLabel(org.nuiton.wikitty.WikittyClient, java.lang.String, int, int) } */ + @Deprecated static public PagedResult<Wikitty> findAllByLabel(WikittyProxy proxy, String label, int firstIndex, int endIndex) { WikittyLabelImpl l = new WikittyLabelImpl(); @@ -115,11 +143,33 @@ } /** + * Recherche tous les objets qui ont ce label + * + * @param client + * @param label + * @param first + * @param limit + * @return + */ + static public WikittyQueryResult<Wikitty> findAllByLabel(WikittyClient client, + String label, int firstIndex, int limit) { + + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyLabel.ELEMENT_FIELD_WIKITTYLABEL_LABELS, label).end() + .setFirst(firstIndex).setLimit(limit); + WikittyQueryResult<Wikitty> result = client.findAllByQuery(Wikitty.class, query); + + return result; + } + + /** * Recherche le premier objet qui a ce label * @param proxy * @param label * @return + * @deprecated since 3.4 use {@link #findByLabel(org.nuiton.wikitty.WikittyClient, java.lang.String) } */ + @Deprecated static public Wikitty findByLabel(WikittyProxy proxy, String label) { WikittyLabelImpl l = new WikittyLabelImpl(); l.addLabels(label); @@ -130,12 +180,27 @@ } /** + * Recherche le premier objet qui a ce label + * @param proxy + * @param label + * @return + */ + static public Wikitty findByLabel(WikittyClient proxy, String label) { + WikittyQuery query = new WikittyQueryMaker() + .eq(WikittyLabel.ELEMENT_FIELD_WIKITTYLABEL_LABELS, label).end(); + Wikitty result = proxy.findByQuery(Wikitty.class, query); + return result; + } + + /** * Retrieve all labels applied on a wikitty object. * * @param proxy * @param wikittyId * @return set of label + * @deprecated since 3.4 use {@link #findAllAppliedLabels(org.nuiton.wikitty.WikittyClient, java.lang.String) } */ + @Deprecated static public Set<String> findAllAppliedLabels(WikittyProxy proxy, String wikittyId) { Wikitty w = proxy.restore(wikittyId); Set<String> result = WikittyLabelHelper.getLabels(w); @@ -143,4 +208,18 @@ return result; } + /** + * Retrieve all labels applied on a wikitty object. + * + * @param client + * @param wikittyId + * @return set of label + */ + static public Set<String> findAllAppliedLabels(WikittyClient proxy, String wikittyId) { + Wikitty w = proxy.restore(wikittyId); + Set<String> result = WikittyLabelHelper.getLabels(w); + + return result; + } + } Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportQueryTask.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -0,0 +1,82 @@ +/* + * #%L + * Wikitty :: api + * + * $Id: ExportTask.java 1136 2011-08-12 14:24:03Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-api/src/main/java/org/nuito… $ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * 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.wikitty.addons.importexport; + +import java.io.Writer; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.WikittyClient; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryResult; +import org.nuiton.wikitty.query.conditions.Element; + +public class ExportQueryTask implements Runnable { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(ImportTask.class); + + protected WikittyClient client; + protected FORMAT format; + protected WikittyQuery query; + protected Writer writer; + + public ExportQueryTask(WikittyClient client, FORMAT format, WikittyQuery query, Writer writer) { + this.client = client; + this.format = format; + this.query = query; + this.writer = writer; + } + + @Override + public void run() { + try { + + // use a facet to get only extension used in export + // used for CSV export + query.addFacetField(Element.EXTENSION); + + WikittyQueryResult<Wikitty> queryResult = client.findAllByQuery( + Wikitty.class, query); + + long time = 0; + if (log.isInfoEnabled()) { + time = System.currentTimeMillis(); + log.info("Export started"); + } + + ImportExportMethod exporter = format.ieporter(); + exporter.exportWriter(client, writer, queryResult); + if (log.isInfoEnabled()) { + time = System.currentTimeMillis() - time; + log.info("Export in (ms)" + time); + } + } catch (Exception eee) { + throw new WikittyException("Error during export task", eee); + } + } +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportTask.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ExportTask.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -36,6 +36,12 @@ import org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT; import org.nuiton.wikitty.search.operators.Element; +/** + * + * @author poussin + * @deprecated since 3.4 use ExportQueryTask with new query api + */ +@Deprecated public class ExportTask implements Runnable { /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -37,8 +37,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.search.PagedResult; @@ -48,12 +46,18 @@ import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.search.operators.Element; -import org.nuiton.wikitty.search.Search; import au.com.bytecode.opencsv.CSVReader; import au.com.bytecode.opencsv.CSVWriter; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import org.nuiton.wikitty.WikittyClient; +import org.nuiton.wikitty.query.FacetTopic; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; +import org.nuiton.wikitty.query.conditions.Element; /** * @@ -78,8 +82,7 @@ protected Pattern queryPattern = Pattern.compile("^((\\w+)\\.(\\w+))=(\"(.+)\"|([^\"]+))$"); @Override - public void importReader(String securityToken, Reader reader, - WikittyService ws) throws Exception { + public void importReader(WikittyClient client, Reader reader) throws Exception { // get index of wikitty.id field int wikittyIdIndex = -1; @@ -135,7 +138,7 @@ for (String extension : extensions) { String extName = extension.trim(); addMissingExtension( - securityToken, ws, currentWikitty, extName); + client, currentWikitty, extName); } } } @@ -156,10 +159,10 @@ if (StringUtils.isNotEmpty(value)) { // extension must exists on wikitty to set a field value - addMissingExtension(securityToken, ws, currentWikitty, extName); + addMissingExtension(client, currentWikitty, extName); // convert link values (if necessary) - value = convertLinkValues(securityToken, ws, value); + value = convertLinkValues(client, value); // add value to correct field FieldType fieldType = currentWikitty.getFieldType(extName + "." + fieldName); @@ -174,11 +177,10 @@ // remove non existant wikitty on Wikitty type field if (fieldType.getType().equals(TYPE.WIKITTY)) { - + // restore works (database) but solr criteria won't - List<Wikitty> wikitties = ws.restore(securityToken, - Collections.singletonList(multiplesValue)); - if ( wikitties != null && wikitties.size() == 1 && wikitties.get(0) != null) { + Wikitty wikitty = client.restore(multiplesValue); + if ( wikitty != null) { currentWikitty.addToField(extName, fieldName, multiplesValue); } } @@ -189,11 +191,10 @@ } else { // remove non existant wikitty on Wikitty type field if (fieldType.getType().equals(TYPE.WIKITTY)) { - + // restore works (database) but solr criteria won't - List<Wikitty> wikitties = ws.restore(securityToken, - Collections.singletonList(value)); - if ( wikitties != null && wikitties.size() == 1 && wikitties.get(0) != null) { + Wikitty wikitty = client.restore(value); + if ( wikitty != null) { currentWikitty.setField(extName, fieldName, value); } } @@ -205,21 +206,30 @@ } // add it into datas - ws.store(securityToken, Collections.singleton(currentWikitty), true); + client.getWikittyService().store(client.getSecurityToken(), + Collections.singleton(currentWikitty), true); } } - + + + @Override + public void importReader(String securityToken, Reader reader, + WikittyService ws) throws Exception { + WikittyClient client = new WikittyClient(null, ws, securityToken); + importReader(client, reader); + } + /** * Recusively add missing extension of not exist and required extension too. * * @throws WikittyException if the extension does not exist in base */ - protected void addMissingExtension(String securityToken, WikittyService ws, + protected void addMissingExtension(WikittyClient client, Wikitty currentWikitty, String extName) { // extension must exists on wikitty to set a field value if (!currentWikitty.hasExtension(extName)) { - WikittyExtension extension = ws.restoreExtensionLastVersion( - securityToken, extName); + WikittyExtension extension = + client.restoreExtensionLastVersion(extName); if (extension != null) { List<String> requires = extension.getRequires(); @@ -227,7 +237,7 @@ // add required extensions BEFORE current for (String require : requires) { String localRequire = require.trim(); - addMissingExtension(securityToken, ws, currentWikitty, localRequire); + addMissingExtension(client, currentWikitty, localRequire); } } @@ -244,8 +254,7 @@ * @param value * @return */ - protected String convertLinkValues( - String securityToken, WikittyService ws, String value) { + protected String convertLinkValues(WikittyClient client, String value) { String originalValue = value; String resultValue = ""; @@ -256,8 +265,8 @@ try { String[] queries = StringUtil.split(value, ","); - for (String query : queries) { - Matcher m = queryPattern.matcher(query.trim()); + for (String queryString : queries) { + Matcher m = queryPattern.matcher(queryString.trim()); if (m.find()) { String fqField = m.group(1); String fValue = m.group(5); @@ -265,11 +274,9 @@ // quoted value fValue = m.group(6); } - Criteria criteria = Search.query().eq(fqField, fValue).criteria(); - String id = ws.findByCriteria(securityToken, - Collections.singletonList(criteria)).get(0); - Wikitty wikitty = WikittyServiceEnhanced.restore( - ws, securityToken, id); + WikittyQuery query = new WikittyQueryMaker() + .eq(fqField, fValue).end(); + Wikitty wikitty = client.findByQuery(Wikitty.class, query); if (wikitty == null) { correctQueries = false; } @@ -299,20 +306,19 @@ } @Override - public void exportWriter(String securityToken, Writer writer, - WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { + public void exportWriter(WikittyClient client, Writer writer, + WikittyQueryResult<Wikitty> pagedResult) throws Exception { CSVWriter csvWriter = new CSVWriter(writer); - + // write all data into writer List<String> extensionHeader = new LinkedList<String>(); extensionHeader.add(FIELD_WIKITTY_ID); extensionHeader.add(FIELD_WIKITTY_EXT); - for (FacetTopic topic : pagedResult.getTopic(Element.ELT_EXTENSION)) { + for (FacetTopic topic : pagedResult.getTopic(Element.EXTENSION)) { String extName = topic.getTopicName(); - - WikittyExtension extension = ws.restoreExtensionLastVersion( - securityToken, extName); + + WikittyExtension extension = client.restoreExtensionLastVersion(extName); String ext = WikittyExtension.computeName(extName); for (String fieldName : extension.getFieldNames()) { extensionHeader.add(ext + "." + fieldName); @@ -357,14 +363,36 @@ String fqFieldValue = WikittyUtil.toStringForExport(type, w.getFqField(fieldName)); currentField = fqFieldValue; } - + wikittyField[extensionHeader.indexOf(fieldName)] = currentField; } - + csvWriter.writeNext(wikittyField); } - + csvWriter.close(); } + @Override + public void exportWriter(String securityToken, Writer writer, + WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { + WikittyClient client = new WikittyClient(null, ws, securityToken); + + Map<String, List<FacetTopic>> facet = new HashMap<String, List<FacetTopic>>(); + for (Map.Entry<String, List<org.nuiton.wikitty.search.FacetTopic>> e : pagedResult.getFacets().entrySet()) { + String facetName = e.getKey(); + List<FacetTopic> topics = new ArrayList<FacetTopic>(); + facet.put(facetName, topics); + for (org.nuiton.wikitty.search.FacetTopic f : e.getValue()) { + topics.add(new FacetTopic(f.getFacetName(), f.getTopicName(), f.getCount())); + } + } + + WikittyQueryResult<Wikitty> queryResult = new WikittyQueryResult( + pagedResult.getCriteriaName(), pagedResult.getFirstIndice(), + pagedResult.getNumFound(), pagedResult.getQueryString(), facet, + pagedResult.getAll()); + exportWriter(client, writer, queryResult); + } + } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportMethod.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportMethod.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportMethod.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -27,10 +27,12 @@ import java.io.Reader; import java.io.Writer; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.services.WikittyTransaction; /** @@ -46,29 +48,59 @@ /** * Import data from reader. - * + * * @param securityToken security token * @param reader reader * @param ws wikitty service * @param transaction current transaction * @param batchUpdate wikitty batch update helper - * + * * @throws Exception */ + public void importReader(WikittyClient client, Reader reader) throws Exception; + + /** + * Import data from reader. + * + * @param securityToken security token + * @param reader reader + * @param ws wikitty service + * @param transaction current transaction + * @param batchUpdate wikitty batch update helper + * + * @throws Exception + * @deprecated since 3.4 use {@link #importReader(org.nuiton.wikitty.WikittyClient, java.io.Reader) } + */ public void importReader( String securityToken, Reader reader, WikittyService ws) throws Exception; - + /** * Export data to writer. - * + * * @param securityToken security token * @param writer writer * @param ws wikitty service * @param transaction current transaction * @param pagedResult paged result - * + * * @throws Exception */ + public void exportWriter(WikittyClient client, Writer writer, + WikittyQueryResult<Wikitty> queryResult) throws Exception; + + /** + * Export data to writer. + * + * @param securityToken security token + * @param writer writer + * @param ws wikitty service + * @param transaction current transaction + * @param pagedResult paged result + * + * @throws Exception + * @deprecated since 3.4 use {@link #exportWriter(org.nuiton.wikitty.WikittyClient, java.io.Writer, org.nuiton.wikitty.query.WikittyQueryResult) } + */ + @Deprecated public void exportWriter(String securityToken, Writer writer, WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -40,6 +40,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.entities.FieldType; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.entities.Wikitty; @@ -47,8 +48,8 @@ import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.services.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.query.WikittyQueryResult; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserFactory; @@ -66,8 +67,7 @@ static private Log log = LogFactory.getLog(ImportExportXML.class); @Override - public void importReader(String securityToken, Reader reader, - WikittyService ws) throws Exception { + public void importReader(WikittyClient client, Reader reader) throws Exception { XmlPullParserFactory factory = XmlPullParserFactory.newInstance( System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); factory.setNamespaceAware(true); @@ -103,7 +103,7 @@ String extName = WikittyExtension.computeName(extId); String extVersion = WikittyExtension.computeVersion(extId); extId = WikittyExtension.computeId(extName, extVersion); - WikittyExtension e = ws.restoreExtension(securityToken, extId); + WikittyExtension e = client.restoreExtension(extId); if (e == null) { throw new WikittyException("Extension not found : " + extId); } @@ -113,11 +113,12 @@ } else if (eventType == XmlPullParser.END_TAG) { String name = xpp.getName(); if ("extension".equals(name)) { - ws.storeExtension(securityToken, Collections.singleton(ext)); + client.storeExtension(Collections.singleton(ext)); ext = null; } else if ("object".equals(name)) { w.setVersion(objectVersion); - ws.store(securityToken, Collections.singleton(w), true); + client.getWikittyService().store(client.getSecurityToken(), + Collections.singleton(w), true); w = null; } else if (ext != null && "field".equals(name)) { FieldType type = new FieldType(); @@ -143,13 +144,13 @@ } @Override - public void exportWriter(String securityToken, Writer result, - WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { + public void exportWriter(WikittyClient client, Writer result, + WikittyQueryResult<Wikitty> queryResult) throws Exception { // keep extension already done Set<String> extDone = new HashSet<String>(); result.write("<wikitty>\n"); - - List<Wikitty> wikitties = pagedResult.getAll(); + + List<Wikitty> wikitties = queryResult.getAll(); for (Wikitty w : wikitties) { String extensionList = ""; for (WikittyExtension ext : w.getExtensions()) { @@ -203,4 +204,25 @@ } result.write("</wikitty>\n"); } + + @Override + public void importReader(String securityToken, Reader reader, + WikittyService ws) throws Exception { + WikittyClient client = new WikittyClient(null, ws, securityToken); + importReader(client, reader); + } + + @Override + public void exportWriter(String securityToken, Writer result, + WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { + + WikittyClient client = new WikittyClient(null, ws, securityToken); + + WikittyQueryResult<Wikitty> queryResult = new WikittyQueryResult( + pagedResult.getCriteriaName(), pagedResult.getFirstIndice(), + pagedResult.getNumFound(), pagedResult.getQueryString(), null, + pagedResult.getAll()); + exportWriter(client, result, queryResult); + + } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportTask.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT; @@ -38,26 +39,41 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(ImportTask.class); - protected ApplicationConfig config; - protected WikittyService ws; + WikittyClient client; protected FORMAT format; protected Reader reader; protected ImportExportMethod importerExporter; - protected String securityToken; - public ImportTask(String securityToken, ApplicationConfig config, - WikittyService ws, FORMAT format, Reader reader) { + public ImportTask(WikittyClient client, FORMAT format, Reader reader) { super(); - this.config = config; - this.securityToken = securityToken; - this.ws = ws; + this.client = client; this.format = format; this.reader = reader; } + /** + * + * @param securityToken + * @param config + * @param ws + * @param format + * @param reader + * @deprecated since 3.4 {@link #ImportTask(org.nuiton.wikitty.WikittyClient, org.nuiton.wikitty.addons.WikittyImportExportService.FORMAT, java.io.Reader) } + */ + @Deprecated + public ImportTask(String securityToken, ApplicationConfig config, + WikittyService ws, FORMAT format, Reader reader) { + this(new WikittyClient(config, ws, securityToken), format, reader); + } + + public WikittyClient getClient() { + return client; + } + @Override public void run() { - WikittyServiceTransaction tx = new WikittyServiceTransaction(config, ws); + WikittyServiceTransaction tx = new WikittyServiceTransaction( + client.getConfig(), client.getWikittyService()); // TODO poussin 20101029 rendre configurable le l'auto commit '1000' pour l'import tx.setAutoCommit(1000); try { @@ -66,19 +82,19 @@ time = System.currentTimeMillis(); log.info("Import in (ms)" + time); } + WikittyClient txClient = new WikittyClient( + client.getConfig(), tx, client.getSecurityToken()); ImportExportMethod importer = format.ieporter(); - importer.importReader(securityToken, reader, tx); + importer.importReader(txClient, reader); if (log.isInfoEnabled()) { time = System.currentTimeMillis() - time; log.info("Import in (ms)" + time); } - // don't forget to commit :) - // FIXME sletellier 24/12/10 : provoque an wikitty is obselete -// tx.commit(securityToken); - tx.commit(securityToken, true); + // don't forget to commit :) with true to force version + tx.commit(client.getSecurityToken(), true); } catch (Exception eee) { - tx.rollback(securityToken); + tx.rollback(client.getSecurityToken()); throw new WikittyException("Error during import task", eee); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQuery.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -265,7 +265,7 @@ return facetField; } - public WikittyQuery addFacetField(ElementField field) { + public WikittyQuery addFacetField(Element field) { getFacetField().add(field); return this; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/query/WikittyQueryResult.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -34,6 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyClient; +import org.nuiton.wikitty.query.conditions.Element; /** * Represente un resultat de requete {@link WikittyQuery}. Pour caster les @@ -133,6 +134,18 @@ } /** + * Return all topic for the specified facet. + * + * @param facetName name of the wanted facet + * @return facet's topics + * @since 3.4 + */ + public List<FacetTopic> getTopic(Element facetName) { + List<FacetTopic> result = getTopic(facetName.getValue()); + return result; + } + + /** * Return topic for the specified facet and topic name. * * @param facetName name of the wanted facet Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -26,13 +26,8 @@ package org.nuiton.wikitty.services; -import java.util.ArrayList; -import java.util.List; -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyAuthorisation; import org.nuiton.wikitty.entities.WikittyAuthorisationHelper; @@ -41,8 +36,11 @@ import org.nuiton.wikitty.entities.WikittyGroupImpl; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyMetaExtensionUtil; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.search.Search; /** @@ -66,7 +64,9 @@ * * @param login the login of the user to search for * @return a wikitty id + * @deprecated since 3.4 {@link #getUserWikittyId(org.nuiton.wikitty.WikittyClient, java.lang.String) } */ + @Deprecated static public String getUserWikittyId(WikittyProxy proxy, String login) { String userWikittyId = null; Wikitty user = proxy.findByCriteria(Search.query().eq( @@ -78,6 +78,19 @@ } /** + * get the id of a user given his login. + * + * @param login the login of the user to search for + * @return a wikitty id + */ + static public String getUserWikittyId(WikittyClient client, String login) { + WikittyQuery query = new WikittyQueryMaker().eq( + WikittyUser.FQ_FIELD_WIKITTYUSER_LOGIN, login).end(); + String userWikittyId = client.findByQuery(query); + return userWikittyId; + } + + /** * create appAdminGroup and add current user as first member * * @deprecated Use #WikittySecurityUtil.createAppAdminGroup @@ -111,6 +124,14 @@ return result; } + /** + * + * @param proxy + * @param extension + * @return + * @deprecated since 3.4 use {@link #restoreExtensionAuthorisation(org.nuiton.wikitty.WikittyClient, org.nuiton.wikitty.entities.WikittyExtension) } + */ + @Deprecated static public Wikitty restoreExtensionAuthorisation( WikittyProxy proxy, WikittyExtension extension) { String wikittyAuthorisationId = WikittyMetaExtensionUtil.generateId( @@ -119,42 +140,12 @@ return result; } - -// /** -// * @param securityToken token with rights to modify extension -// * @param extensionRights a wikitty that has extension WikittyAuthorisation -// */ -// static public void storeExtensionAuthorisation(String securityToken, -// Wikitty extensionRights) { -// -// String userId = getUserId(securityToken); -// -// Wikitty oldVersion = ws.restore(securityToken, extensionRights.getId()); -// -// // check that the extensionRights does not have -// if (WikittyAuthorisationHelper.hasExtension(extensionRights)) { -// -// if (oldVersion == null) { -// // if this exception is raised, you should use addExtensionAuthorisation() -// throw new IllegalArgumentException("you can't store an authorisation for the fist time"); -// -// } else { -// -// if ( userIsAnonymousOrAppAdmin(securityToken, userId) || -// canAdmin(securityToken, userId, null, oldVersion) ) { -// -// ws.store(securityToken, extensionRights); -// -// } else { -// throw new SecurityException(String.format( -// "user %s can't admin rights for this extension", userId)); -// } -// } -// } else { -// throw new IllegalArgumentException(String.format( -// "extensionRights %s is not a wikittyAuthorisation. It misses the extension", -// extensionRights)); -// } -// } -// + static public Wikitty restoreExtensionAuthorisation( + WikittyClient client, WikittyExtension extension) { + String wikittyAuthorisationId = WikittyMetaExtensionUtil.generateId( + WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, extension.getName()); + Wikitty result = client.restore(wikittyAuthorisationId); + return result; + } + } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceHook.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceHook.java 2012-01-12 17:24:58 UTC (rev 1319) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceHook.java 2012-01-12 20:00:00 UTC (rev 1320) @@ -39,9 +39,9 @@ import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyHook; import org.nuiton.wikitty.entities.WikittyHookHelper; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryResult; /** * Cette classe permet d'intercepter les modifications faites via les differentes @@ -92,11 +92,13 @@ } protected Collection<Wikitty> getHook(String securityToken, String actionName) { - Criteria criteria = Search.query().exteq(WikittyHook.EXT_WIKITTYHOOK) - .and().eq(WikittyHook.FQ_FIELD_WIKITTYHOOK_ACTIONTOHOOK, actionName) - .criteria(); - PagedResult<String> ids = getDelegate().findAllByCriteria(securityToken, - Collections.singletonList(criteria)).get(0); + WikittyQuery query = new WikittyQueryMaker() + .and() + .exteq(WikittyHook.EXT_WIKITTYHOOK) + .eq(WikittyHook.FQ_FIELD_WIKITTYHOOK_ACTIONTOHOOK, actionName) + .end(); + WikittyQueryResult<String> ids = getDelegate().findAllByQuery(securityToken, + Collections.singletonList(query)).get(0); List<Wikitty> result = getDelegate().restore(securityToken, ids.getAll()); @@ -134,7 +136,7 @@ args = callHook(securityToken, PRE_STORE, args, null); securityToken = (String)args.get("securityToken"); - wikitties= (Collection<Wikitty>)args.get("wikitties"); + wikitties = (Collection<Wikitty>)args.get("wikitties"); force = (Boolean)args.get("force"); WikittyEvent result = super.store(securityToken, wikitties, force);

1 0