Author: bpoussin Date: 2010-10-15 19:46:03 +0200 (Fri, 15 Oct 2010) New Revision: 419 Url: http://nuiton.org/repositories/revision/wikitty/419 Log: to prevent conflict rename Tree to WikittyTreeNode rename TreeNode to WikittyTreeNode rename SecurityToken to WikittyToken rename Label to WikittyLabel rename WikittyLabelHelper to WikittyLabelUtil http://www.nuiton.org/issues/show/953 Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-15 17:38:43 UTC (rev 418) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-15 17:46:03 UTC (rev 419) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin POUSSIN * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% - * Copyright (c) 2009 poussin. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU 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 Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - *##%*/ package org.nuiton.wikitty.solr; @@ -69,7 +53,7 @@ import org.nuiton.wikitty.FieldType; import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.PagedResult; -import org.nuiton.wikitty.TreeNode; +import org.nuiton.wikitty.WikittyTreeNode; import org.nuiton.wikitty.UpdateResponse; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; @@ -119,7 +103,7 @@ static final public String SOLR_QUERY_PARSER = "{!wikitty}"; // Use for indexation tree node - static final public String TREENODE_PREFIX = TreeNode.EXT_TREENODE + "."; + static final public String TREENODE_PREFIX = WikittyTreeNode.EXT_WIKITTYTREENODE + "."; static final public String TREENODE_EMPTY = TREENODE_PREFIX + "empty"; static final public String TREENODE_ROOT = TREENODE_PREFIX + "root"; static final public String TREENODE_PATH = TREENODE_PREFIX + "path"; @@ -272,7 +256,7 @@ // is root return null; } - parentId = (String) doc.getFieldValue(TreeNode.FQ_FIELD_TREENODE_PARENT); + parentId = (String) doc.getFieldValue(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); parents.put(nodeId, parentId); } @@ -338,7 +322,7 @@ Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); // Find all node contain child - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_ATTACHMENT + ":" + id); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT + ":" + id); QueryResponse response = solrServer.query(query); SolrDocumentList updateDocs = response.getResults(); @@ -551,15 +535,15 @@ for (Wikitty w : wikitties) { String id = w.getId(); - if (w.hasExtension(TreeNode.EXT_TREENODE)) { + if (w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { - Set<String> attachments = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + Set<String> attachments = w.getFieldAsSet(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); reindexChildTreeNode.putIncludedAttachments(id, attachments); // Search deleted children SolrDocument treeNodeDoc = findById(solrServer, id); if (treeNodeDoc != null) { - Collection oldAttachments = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT); + Collection oldAttachments = treeNodeDoc.getFieldValues(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT); if (oldAttachments != null) { // if no more children, remove all old children if(attachments == null) { @@ -576,7 +560,7 @@ } // Get new parent id (may be the same old parent) - String parentId = w.getFieldAsString(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); + String parentId = w.getFieldAsString(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); reindexChildTreeNode.putParent(id, parentId); } @@ -771,7 +755,7 @@ public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); + String parent = w.getFieldAsWikitty(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -792,7 +776,7 @@ public Map<String, Integer> findAllChildrenCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); + String parent = w.getFieldAsWikitty(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -819,7 +803,7 @@ log.debug("Facet result " + counts); // Find all children, add the other node not found with facet - criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, wikittyId).criteria() + criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, wikittyId).criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); search = findAllByCriteria(transaction, criteria); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-10-15 17:38:43 UTC (rev 418) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-10-15 17:46:03 UTC (rev 419) @@ -41,9 +41,9 @@ import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.ExtensionFactory; import org.nuiton.wikitty.FieldType.TYPE; -import org.nuiton.wikitty.Tree; -import org.nuiton.wikitty.TreeNode; -import org.nuiton.wikitty.TreeNodeImpl; +import org.nuiton.wikitty.WikittyTree; +import org.nuiton.wikitty.WikittyTreeNode; +import org.nuiton.wikitty.WikittyTreeNodeImpl; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyImpl; @@ -142,7 +142,7 @@ Wikitty node = findNode(nodeName); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); + node.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); } @@ -150,7 +150,7 @@ * Find node by name */ protected Wikitty findNode(String nodeName) { - Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_NAME, nodeName).criteria(); + Criteria criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, nodeName).criteria(); Wikitty wikitty = ws.findByCriteria(null, criteria); return wikitty; } @@ -171,15 +171,15 @@ int sum = 0; // Sum value in node - Set<String> values = node.getFieldAsSet(TreeNode.EXT_TREENODE, - TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + Set<String> values = node.getFieldAsSet(WikittyTreeNode.EXT_WIKITTYTREENODE, + WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); if(values != null) { sum = values.size(); } // Sum children node in node String nodeId = node.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); /* for (Integer count : children.values()) { @@ -187,12 +187,12 @@ } */ - for (Map.Entry<TreeNode, Integer> e : children.entrySet()) { + for (Map.Entry<WikittyTreeNode, Integer> e : children.entrySet()) { log.debug("*treeNode = " + e.getKey().getName() + " " + e.getValue() + " -> " + e.getKey().getAttachment()); } - for (TreeNode treeNode : children.keySet()) { + for (WikittyTreeNode treeNode : children.keySet()) { Set<String> treeNodeChildren = treeNode.getAttachment(); log.debug("+treeNode = " + treeNode.getName() + " " + (treeNodeChildren==null?0:treeNodeChildren.size()) + " -> " + treeNodeChildren); @@ -201,24 +201,24 @@ // } else { // sum += treeNodeChildren.size(); // } - sum += sum(((TreeNodeImpl)treeNode).getWikitty()); + sum += sum(((WikittyTreeNodeImpl)treeNode).getWikitty()); } return sum; } /** - * Create a Wikitty TreeNode + * Create a Wikitty WikittyTreeNode * * @param name * name of the node * @param parentId * id of the parent * @return - * the wikitty object corresponding to the TreeNode + * the wikitty object corresponding to the WikittyTreeNode */ protected Wikitty createNode(String name, String parentId) { - TreeNodeImpl node = new TreeNodeImpl(); + WikittyTreeNodeImpl node = new WikittyTreeNodeImpl(); node.setName(name); node.setParent(parentId); Wikitty nodeWikitty = node.getWikitty(); @@ -230,7 +230,7 @@ Wikitty root = findNode("root"); String rootId = root.getId(); - Tree tree = ws.restoreTree(null, rootId); + WikittyTree tree = ws.restoreTree(null, rootId); assertNotNull(tree); } @@ -254,7 +254,7 @@ Wikitty node1 = findNode("node1"); String node1Id = node1.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); assertEquals(3, children.size()); } @@ -264,7 +264,7 @@ String node1Id = node1.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); assertEquals(3, children.size()); } @@ -273,7 +273,7 @@ Wikitty node11 = findNode("node11"); String node11Id = node11.getId(); - Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, null); + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, null); assertEquals(3, count.getValue().intValue()); } @@ -283,7 +283,7 @@ String node11Id = node11.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); assertEquals(1, count.getValue().intValue()); } @@ -292,7 +292,7 @@ // Check that node 2 it has any child Wikitty node2 = findNode("node2"); String node2Id = node2.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); assertEquals(0, children.size()); // Create a new node, child of node 2 @@ -321,7 +321,7 @@ // Add it in the node2 (now: two values in it) Wikitty node = findNode("node2"); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); + node.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); // now, there is one more value for the root node @@ -373,16 +373,16 @@ // Remove a value on node11 Wikitty node = findNode("node11"); - List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); - node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leafs.get(0)); + List<String> leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); + node.removeFromField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leafs.get(0)); - leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); log.info("leafs after remove = " + leafs); ws.store(null, node); node = ws.restore(null, node.getId()); - leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); log.info("leafs after restore = " + leafs); // now, there is one more value for the root node @@ -394,14 +394,14 @@ @Test public void testSimpleDeleteChild() throws Exception { - TreeNodeImpl parent = new TreeNodeImpl(); + WikittyTreeNodeImpl parent = new WikittyTreeNodeImpl(); ws.store(null, parent.getWikitty()); - TreeNodeImpl child = new TreeNodeImpl(); + WikittyTreeNodeImpl child = new WikittyTreeNodeImpl(); child.setParent(parent.getWikittyId()); ws.store(null, child.getWikitty()); - Map<TreeNode, Integer> children = ws.restoreChildren(null, parent.getWikittyId(), null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, parent.getWikittyId(), null); assertEquals(1, children.size()); assertEquals(0, children.get(child).intValue()); @@ -446,7 +446,7 @@ int childSum2 = sum(node2); // Move node 1 in mode 2 - node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT, node2); + node121.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT, node2); ws.store(null, node121); // now, there is less value node 121 for the node 1 @@ -468,18 +468,18 @@ String valueId = value.getId(); Wikitty node31 = findNode("node31"); - node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); + node31.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, valueId); ws.store(null, node31); Wikitty node32 = findNode("node32"); - node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); + node32.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, valueId); ws.store(null, node32); Wikitty node3 = findNode("node3"); int sum = sum(node3); assertEquals(2, sum); - Entry<TreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); assertEquals(1, count.getValue().intValue()); sum = sum(node31);