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 <strong>NOT</strong> 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();