Author: echatellier Date: 2010-09-27 10:59:55 +0200 (Mon, 27 Sep 2010) New Revision: 347 Url: http://nuiton.org/repositories/revision/wikitty/347 Log: Rename TreeNode#children to "attachment" Added: trunk/src/site/rst/changes.rst Removed: trunk/src/site/rst/gwt.rst Modified: trunk/src/site/site.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/xmi/wikitty.zargo trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java trunk/wikitty-api/src/test/resources/csv/importtree.csv 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 Added: trunk/src/site/rst/changes.rst =================================================================== --- trunk/src/site/rst/changes.rst (rev 0) +++ trunk/src/site/rst/changes.rst 2010-09-27 08:59:55 UTC (rev 347) @@ -0,0 +1,14 @@ +Changes +======= + +TreeNode +-------- + +Since 2.2, attribute "children" in tree node has been renamed to "attachment" +du to confusion between attached wikitty and sub node children. + +TreeNode extension version has been increased to ``2.0``. + +You will need to migrate_ your wikitties. + +.. _migrate: migration.html \ No newline at end of file Deleted: trunk/src/site/rst/gwt.rst =================================================================== --- trunk/src/site/rst/gwt.rst 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/src/site/rst/gwt.rst 2010-09-27 08:59:55 UTC (rev 347) @@ -1,12 +0,0 @@ -Probleme -======== - -GWT ne support pas: -- BigDecimal - le plus gros probleme -- PropertyChangeSupport - normalement il est possible de l'utiliser en ajouter des choses a GWT (voir avec Nicolas C.) -- Pattern - a ete deplace dans des methodes util -- String.format - peut-etre remplace par une methode util dans wikitty car seulement utilise pour les messages d'erreur avec des arguments (donc toString sur les arguments si non null) Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/src/site/site.xml 2010-09-27 08:59:55 UTC (rev 347) @@ -11,9 +11,9 @@ <body> <menu name="Overview"> <item name="Accueil" href="index.html"/> + <item name="Changes" href="changes.html"/> <item name="Migration" href="migration.html"/> <item name="Hessian" href="hessian.html"/> - <item name="GWT problem" href="gwt.html"/> <item name="TODO" href="todo.html"/> </menu> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-27 08:59:55 UTC (rev 347) @@ -535,14 +535,14 @@ } // Store node with have deleted child - criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_CHILDREN, id).criteria(); + criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT, id).criteria(); wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { if(!ids.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); - TreeNodeHelper.removeChildren(treeNode, id); + TreeNodeHelper.removeAttachment(treeNode, id); storedWikitties.add(treeNode); } } Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo =================================================================== (Binary files differ) 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 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -425,6 +425,6 @@ WikittyExtension wikittyExtension = TreeNodeAbstract.extensionTreeNode; Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_PARENT).getType()); Assert.assertEquals(TYPE.STRING, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_NAME).getType()); - Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_CHILDREN).getType()); + Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_ATTACHMENT).getType()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -467,7 +467,7 @@ } fail( "Unable to find node " + nodeName + " inside " + currentNode.getName() ); } - currentNode.addChildren( wikitty.getId() ); + currentNode.addAttachment(wikitty.getId()); ws.store(null, currentNode.getWikitty()); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -182,7 +182,7 @@ PagedResult<TreeNode> pagedResult3 = proxy.findAllByCriteria(TreeNode.class, criteria3); Assert.assertEquals(1, pagedResult3.getNumFound()); TreeNode myTreeNode = pagedResult3.getFirst(); - Assert.assertEquals(1, myTreeNode.getChildren().size()); + Assert.assertEquals(1, myTreeNode.getAttachment().size()); // test des requetes imbriquées Criteria criteria4 = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, myTreeNode.getWikittyId()).criteria(); Modified: trunk/wikitty-api/src/test/resources/csv/importtree.csv =================================================================== --- trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-09-27 08:59:55 UTC (rev 347) @@ -1,3 +1,3 @@ -"Wikitty.Id","Wikitty.Ext","TreeNode.name","TreeNode.parent","TreeNode.children" +"Wikitty.Id","Wikitty.Ext","TreeNode.name","TreeNode.parent","TreeNode.attachment" "4f6fc798-41f8-48d7-9398-119ef6ab02b6",,"MyRootNode",, "1142aa4c-af5a-4264-9918-9f72d9ef9d59","Tag","MyTreeNode","4f6fc798-41f8-48d7-9398-119ef6ab02b6","(fbcc8aed-7f67-4e3c-a9aa-221373765f8d),(677ee1e7-239f-416c-a353-6e56bc0451e2)" 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-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-27 08:59:55 UTC (rev 347) @@ -180,51 +180,51 @@ parents = new HashMap<String, String>(); } - public void putIncludedChildren(String nodeId, Collection<String> childIds) { - putChildren(includedNodeIds, nodeId, childIds); + public void putIncludedAttachments(String nodeId, Collection<String> attchmentIds) { + putAttachements(includedNodeIds, nodeId, attchmentIds); } - public void putExcludedChildren(String nodeId, Collection<String> childIds) { - putChildren(excludedNodeIds, nodeId, childIds); + public void putExcludedAttachments(String nodeId, Collection<String> attachmentIds) { + putAttachements(excludedNodeIds, nodeId, attachmentIds); } - public void putIncludedChild(String nodeId, String childId) { - putChild(includedNodeIds, nodeId, childId); + public void putIncludedAttachment(String nodeId, String attachmentId) { + putAttachment(includedNodeIds, nodeId, attachmentId); } - public void putExcludedChild(String nodeId, String childId) { - putChild(excludedNodeIds, nodeId, childId); + public void putExcludedAttachment(String nodeId, String attachmentId) { + putAttachment(excludedNodeIds, nodeId, attachmentId); } - public Collection<String> getExcludedNodeIds(String childId) { - Collection<String> result = excludedNodeIds.get(childId); - if(result == null) { + public Collection<String> getExcludedNodeIds(String attachmentId) { + Collection<String> result = excludedNodeIds.get(attachmentId); + if (result == null) { result = new HashSet<String>(); } return result; } - public Collection<String> getIncludedNodeIds(String childId) { - Collection<String> result = includedNodeIds.get(childId); - if(result == null) { + public Collection<String> getIncludedNodeIds(String attachmentId) { + Collection<String> result = includedNodeIds.get(attachmentId); + if (result == null) { result = new HashSet<String>(); } return result; } - protected void putChildren(Map<String, Collection<String>> map, String nodeId, Collection<String> childIds) { - if(childIds != null) { - for (String childId : childIds) { - putChild(map, nodeId, childId); + protected void putAttachements(Map<String, Collection<String>> map, String nodeId, Collection<String> attachmentIds) { + if (attachmentIds != null) { + for (String attachmentId : attachmentIds) { + putAttachment(map, nodeId, attachmentId); } } } - protected void putChild(Map<String, Collection<String>> map, String nodeId, String childId) { - Collection<String> values = map.get(childId); + protected void putAttachment(Map<String, Collection<String>> map, String nodeId, String attachmentId) { + Collection<String> values = map.get(attachmentId); if(values == null) { values = new HashSet<String>(); - map.put(childId, values); + map.put(attachmentId, values); } values.add(nodeId); } @@ -310,7 +310,7 @@ Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); // Find all node contain child - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_CHILDREN + ":" + id); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_ATTACHMENT + ":" + id); QueryResponse response = solrServer.query(query); SolrDocumentList updateDocs = response.getResults(); @@ -519,24 +519,24 @@ for (Wikitty w : wikitties) { String id = w.getId(); - if(w.hasExtension(TreeNode.EXT_TREENODE)) { + if (w.hasExtension(TreeNode.EXT_TREENODE)) { - Set<String> children = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); - reindexChildTreeNode.putIncludedChildren(id, children); + Set<String> attachments = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + reindexChildTreeNode.putIncludedAttachments(id, attachments); // Search deleted children SolrDocument treeNodeDoc = findById(id); - if(treeNodeDoc != null) { - Collection oldChildren = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_CHILDREN); - if(oldChildren != null) { + if (treeNodeDoc != null) { + Collection oldAttachments = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT); + if (oldAttachments != null) { // if no more children, remove all old children - if(children == null) { - reindexChildTreeNode.putExcludedChildren(id, oldChildren); + if(attachments == null) { + reindexChildTreeNode.putExcludedAttachments(id, oldAttachments); } else { // exclude only the removed children - for (Object oldChild : oldChildren) { - if(!children.contains(oldChild)) { - reindexChildTreeNode.putExcludedChild(id,(String) oldChild); + for (Object oldAttachment : oldAttachments) { + if(!attachments.contains(oldAttachment)) { + reindexChildTreeNode.putExcludedAttachment(id,(String) oldAttachment); } } } @@ -580,7 +580,7 @@ for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { SolrDocument solrDocument = iterator.next(); String childId = (String) solrDocument.getFieldValue(SOLR_ID); - reindexChildTreeNode.putExcludedChild(id, childId); + reindexChildTreeNode.putExcludedAttachment(id, childId); } solrResource.deleteDoc(id); 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-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -133,7 +133,7 @@ Wikitty node = findNode(nodeName); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); } @@ -163,7 +163,7 @@ // Sum value in node Set<String> values = node.getFieldAsSet(TreeNode.EXT_TREENODE, - TreeNode.FIELD_TREENODE_CHILDREN, String.class); + TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); if(values != null) { sum = values.size(); } @@ -292,7 +292,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_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); // now, there is one more value for the root node @@ -343,8 +343,8 @@ // Remove a value on node2 Wikitty node = findNode("node11"); - List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); - node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leafs.get(0)); + 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)); ws.store(null, node); // now, there is one more value for the root node @@ -405,11 +405,11 @@ String valueId = value.getId(); Wikitty node31 = findNode("node31"); - node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); + node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); ws.store(null, node31); Wikitty node32 = findNode("node32"); - node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); + node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); ws.store(null, node32); Wikitty node3 = findNode("node3");