r1324 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/addons wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport wikitty-api/src/main/java/org/nuiton/wikitty/entities wikitty-api/src/main/java/org/nuiton/wikitty/query wikitty-api/src/main/java/org/nuiton/wikitty/query/conditions wikitty-api/src/main/java/org/nuiton/wikitty/storage wikitty-api/src/test/java/org/nuiton/wikitty/storage wikitty-generators/src/main/java/org/nuit
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. <br> 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) <br> 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 ... <br> 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; /** *
participants (1)
-
bpoussin＠users.nuiton.org