Author: bpoussin Date: 2010-10-15 19:38:43 +0200 (Fri, 15 Oct 2010) New Revision: 418 Url: http://nuiton.org/repositories/revision/wikitty/418 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 Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.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/api/WikittyUtilTest.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-api/src/test/resources/csv/importtree2.csv Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java 2010-10-15 17:38:43 UTC (rev 418) @@ -1,59 +0,0 @@ -/* - * #%L - * Wikitty :: api - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.wikitty; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.nuiton.wikitty.TreeNode; - -public class Tree implements Serializable { - - /** serialVersionUID. */ - private static final long serialVersionUID = 5785244346524975096L; - - protected TreeNode node; - protected List<Tree> children; - - public void setNode(TreeNode node) { - this.node = node; - } - - public void addChild(Tree tree) { - getChildren().add( tree ); - } - - public List<Tree> getChildren() { - if ( children == null ) { - children = new ArrayList<Tree>(); - } - return children; - } - - public String getName() { - return node.getName(); - } -} Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java 2010-10-15 17:38:43 UTC (rev 418) @@ -1,87 +0,0 @@ -package org.nuiton.wikitty; - - -import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.search.Search; - -/** - * Helper to manage Label (add and find) - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class WikittyLabelHelper { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyLabelHelper.class); - - /** - * Add new lable to the wikitty object. - * - * @param proxy - * @param wikittyId object'id - * @param label label to add - */ - static public void addLabel(WikittyProxy proxy, String wikittyId, String label) { - Wikitty w = proxy.restore(wikittyId); - LabelImpl l = new LabelImpl(w); - l.addLabels(label); - proxy.store(l); - } - - /** - * Recherche tous les objets qui ont ce label - * - * @param proxy - * @param label - * @param firstIndex - * @param endIndex - * @return - */ - static public PagedResult<Wikitty> findAllByLabel(WikittyProxy proxy, - String label, int firstIndex, int endIndex) { - LabelImpl l = new LabelImpl(); - l.addLabels(label); - - Criteria criteria = Search.query(l.getWikitty()).criteria() - .setFirstIndex(firstIndex).setEndIndex(endIndex); - PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); - - return result; - } - - /** - * Recherche le premier objet qui a ce label - * @param proxy - * @param label - * @return - */ - static public Wikitty findByLabel(WikittyProxy proxy, String label) { - LabelImpl l = new LabelImpl(); - l.addLabels(label); - Criteria criteria = Search.query(l.getWikitty()).criteria(); - Wikitty result = proxy.findByCriteria(criteria); - - return result; - } - - /** - * Retrieve all labels applied on a wikitty object. - * - * @param proxy - * @param wikittyId - * @return set of label - */ - static public Set<String> findAllAppliedLabels(WikittyProxy proxy, String wikittyId) { - Wikitty w = proxy.restore(wikittyId); - Set<String> result = LabelHelper.getLabels(w); - - return result; - } - -} Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java (from rev 415, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java 2010-10-15 17:38:43 UTC (rev 418) @@ -0,0 +1,87 @@ +package org.nuiton.wikitty; + + +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.search.Search; + +/** + * Util method to manage Label (add and find) + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyLabelUtil { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyLabelUtil.class); + + /** + * Add new lable to the wikitty object. + * + * @param proxy + * @param wikittyId object'id + * @param label label to add + */ + static public void addLabel(WikittyProxy proxy, String wikittyId, String label) { + Wikitty w = proxy.restore(wikittyId); + WikittyLabelImpl l = new WikittyLabelImpl(w); + l.addLabels(label); + proxy.store(l); + } + + /** + * Recherche tous les objets qui ont ce label + * + * @param proxy + * @param label + * @param firstIndex + * @param endIndex + * @return + */ + static public PagedResult<Wikitty> findAllByLabel(WikittyProxy proxy, + String label, int firstIndex, int endIndex) { + WikittyLabelImpl l = new WikittyLabelImpl(); + l.addLabels(label); + + Criteria criteria = Search.query(l.getWikitty()).criteria() + .setFirstIndex(firstIndex).setEndIndex(endIndex); + PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); + + return result; + } + + /** + * Recherche le premier objet qui a ce label + * @param proxy + * @param label + * @return + */ + static public Wikitty findByLabel(WikittyProxy proxy, String label) { + WikittyLabelImpl l = new WikittyLabelImpl(); + l.addLabels(label); + Criteria criteria = Search.query(l.getWikitty()).criteria(); + Wikitty result = proxy.findByCriteria(criteria); + + return result; + } + + /** + * Retrieve all labels applied on a wikitty object. + * + * @param proxy + * @param wikittyId + * @return set of label + */ + static public Set<String> findAllAppliedLabels(WikittyProxy proxy, String wikittyId) { + Wikitty w = proxy.restore(wikittyId); + Set<String> result = WikittyLabelHelper.getLabels(w); + + return result; + } + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-15 17:38:43 UTC (rev 418) @@ -397,8 +397,8 @@ return wikitty; } - public Tree restoreTree(String wikittyId) { - Tree result = wikittyService.restoreTree(securityToken, wikittyId); + public WikittyTree restoreTree(String wikittyId) { + WikittyTree result = wikittyService.restoreTree(securityToken, wikittyId); return result; } @@ -421,7 +421,7 @@ public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode( Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) { - Map.Entry<TreeNode, Integer> node = wikittyService.restoreNode( + Map.Entry<WikittyTreeNode, Integer> node = wikittyService.restoreNode( securityToken, wikittyId, filter); if(node == null) { return null; @@ -446,17 +446,17 @@ public <E extends BusinessEntity> Map<E, Integer> restoreChildren( Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) { - Map<TreeNode, Integer> result = wikittyService.restoreChildren( + Map<WikittyTreeNode, Integer> result = wikittyService.restoreChildren( securityToken, wikittyId, filter); if(result == null) { return null; } Map<E, Integer> convertedResult = new LinkedHashMap<E, Integer>(); - Set<Entry<TreeNode, Integer>> entries = result.entrySet(); - for (Entry<TreeNode, Integer> entry : entries) { + Set<Entry<WikittyTreeNode, Integer>> entries = result.entrySet(); + for (Entry<WikittyTreeNode, Integer> entry : entries) { - TreeNode node = entry.getKey(); + WikittyTreeNode node = entry.getKey(); //TODO EC-20100420 was : String nodeId = node.getId(); String nodeId = node.getWikittyId(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-15 17:38:43 UTC (rev 418) @@ -401,7 +401,7 @@ * @param wikittyId * @return */ - public Tree restoreTree(String securityToken, String wikittyId); + public WikittyTree restoreTree(String securityToken, String wikittyId); /** * Delete specified tree node and all sub nodes. @@ -420,7 +420,7 @@ * @param wikittyId * @return */ - public Map.Entry<TreeNode, Integer> restoreNode(String securityToken, + public Map.Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter); /** @@ -431,7 +431,7 @@ * @param wikittyId * @return */ - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-10-15 17:38:43 UTC (rev 418) @@ -411,7 +411,7 @@ * @return */ @Override - public Map<TreeNode, Integer> restoreChildren( + public Map<WikittyTreeNode, Integer> restoreChildren( String securityToken, String wikittyId, Criteria filter) { // FIXME lookup in cache, and put in cache return ws.restoreChildren(securityToken, wikittyId, filter); @@ -464,7 +464,7 @@ * @return */ @Override - public Entry<TreeNode, Integer> restoreNode( + public Entry<WikittyTreeNode, Integer> restoreNode( String securityToken, String wikittyId, Criteria filter) { // FIXME lookup in cache, and put in cache return ws.restoreNode(securityToken, wikittyId, filter); @@ -477,7 +477,7 @@ * @return */ @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { // FIXME lookup in cache, and put in cache return ws.restoreTree(securityToken, wikittyId); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-10-15 17:38:43 UTC (rev 418) @@ -214,7 +214,7 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { return delegate.restoreTree(securityToken, wikittyId); } @@ -224,13 +224,13 @@ } @Override - public Entry<TreeNode, Integer> restoreNode(String securityToken, + public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { return delegate.restoreNode(securityToken, wikittyId, filter); } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { return delegate.restoreChildren(securityToken, wikittyId, filter); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-15 17:38:43 UTC (rev 418) @@ -541,27 +541,27 @@ // Store node with have deleted node as parent Criteria criteria = - Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, id).criteria(); + Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, id).criteria(); List<String> wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { if(!ids.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); - TreeNodeHelper.setParent(treeNode, null); + WikittyTreeNodeHelper.setParent(treeNode, null); storedWikitties.add(treeNode); } } // Store node with have deleted child - criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT, id).criteria(); + criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, id).criteria(); wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { if(!ids.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); - TreeNodeHelper.removeAttachment(treeNode, id); + WikittyTreeNodeHelper.removeAttachment(treeNode, id); storedWikitties.add(treeNode); } } @@ -687,23 +687,23 @@ } } - protected Tree restoreTree(String securityToken, + protected WikittyTree restoreTree(String securityToken, WikittyTransaction transaction, String wikittyId) { Wikitty w = restore(securityToken, transaction, wikittyId); if(w == null) { return null; } - if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { throw new WikittyException(String.format( "Wikitty '%s' do not handle extension %s", - wikittyId, TreeNode.EXT_TREENODE )); + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); } - Tree tree = new Tree(); - TreeNode node = new TreeNodeImpl(w); + WikittyTree tree = new WikittyTree(); + WikittyTreeNode node = new WikittyTreeNodeImpl(w); tree.setNode(node); - TreeNodeImpl exempleNode = new TreeNodeImpl(); + WikittyTreeNodeImpl exempleNode = new WikittyTreeNodeImpl(); exempleNode.setParent(wikittyId); Criteria criteria = Search.query(exempleNode.getWikitty()).criteria() @@ -718,12 +718,12 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { WikittyTransaction transaction = new WikittyTransaction(); try { transaction.begin(); - Tree tree = restoreTree(securityToken, transaction, wikittyId); + WikittyTree tree = restoreTree(securityToken, transaction, wikittyId); transaction.commit(); return tree; @@ -776,7 +776,7 @@ protected List<String> getRecursiveTreeNodeId(String securityToken, WikittyTransaction transaction, String treeNodeId) { Search search = Search.query(); - search = search.eq(TreeNode.FQ_FIELD_TREENODE_PARENT, treeNodeId); + search = search.eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, treeNodeId); Criteria criteria = search.criteria(); PagedResult<String> childTreeNodeIds = findAllByCriteria(securityToken, transaction, criteria); @@ -790,7 +790,7 @@ } @Override - public Map.Entry<TreeNode, Integer> restoreNode(String securityToken, + public Map.Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { WikittyTransaction transaction = new WikittyTransaction(); try { @@ -802,17 +802,17 @@ return null; } - if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { throw new WikittyException(String.format( "Wikitty '%s' do not handle extension %s", - wikittyId, TreeNode.EXT_TREENODE )); + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); } - TreeNode node = new TreeNodeImpl(w); + WikittyTreeNode node = new WikittyTreeNodeImpl(w); Integer count = getSearchEngin().findNodeCount(transaction, w, filter); - HashMap.SimpleEntry<TreeNode, Integer> result = - new SimpleEntry<TreeNode, Integer>(node, count); + HashMap.SimpleEntry<WikittyTreeNode, Integer> result = + new SimpleEntry<WikittyTreeNode, Integer>(node, count); transaction.commit(); return result; @@ -823,7 +823,7 @@ } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { WikittyTransaction transaction = new WikittyTransaction(); try { @@ -835,13 +835,13 @@ return null; } - if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { throw new WikittyException(String.format( "Wikitty '%s' do not handle extension %s", - wikittyId, TreeNode.EXT_TREENODE )); + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); } - Map<TreeNode, Integer> result = new LinkedHashMap<TreeNode, Integer>(); + Map<WikittyTreeNode, Integer> result = new LinkedHashMap<WikittyTreeNode, Integer>(); Map<String, Integer> search = getSearchEngin().findAllChildrenCount( transaction, w, filter); @@ -851,7 +851,7 @@ String id = child.getKey(); Wikitty wikitty = restore(securityToken, transaction, id); - TreeNode node = new TreeNodeImpl(wikitty); + WikittyTreeNode node = new WikittyTreeNodeImpl(wikitty); result.put(node, count); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-15 17:38:43 UTC (rev 418) @@ -327,7 +327,7 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { // no notification return ws.restoreTree(securityToken, wikittyId); } @@ -341,14 +341,14 @@ } @Override - public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, + public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { // no notification return ws.restoreNode(securityToken, wikittyId, filter); } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { // no notification return ws.restoreChildren(securityToken, wikittyId, filter); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-15 17:38:43 UTC (rev 418) @@ -84,8 +84,8 @@ String tokenId = WikittyUtil.genSecurityTokenId(); Wikitty wikittyToken = new WikittyImpl(tokenId); // force add extension to wikitty - SecurityTokenHelper.addExtension(wikittyToken); - SecurityTokenHelper.setUser(wikittyToken, user.getId()); + WikittyTokenHelper.addExtension(wikittyToken); + WikittyTokenHelper.setUser(wikittyToken, user.getId()); ws.store(null, wikittyToken); log.debug(String.format("token '%s' is for login '%s'", tokenId, login)); @@ -504,40 +504,40 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { String userId = getUserId(securityToken); - Tree restoredTree = ws.restoreTree(securityToken, wikittyId); + WikittyTree restoredTree = ws.restoreTree(securityToken, wikittyId); checkRestoreTree(securityToken, userId, restoredTree); return restoredTree; } - protected void checkRestoreTree(String securityToken, String userId, Tree tree) { + protected void checkRestoreTree(String securityToken, String userId, WikittyTree tree) { checkRestoreTreeNode(securityToken, userId, tree.node); - for (Tree subTree : tree.getChildren()) { + for (WikittyTree subTree : tree.getChildren()) { checkRestoreTree(securityToken, userId, subTree); } } - protected void checkRestoreTreeNode(String securityToken, String userId, TreeNode treeNode) { + protected void checkRestoreTreeNode(String securityToken, String userId, WikittyTreeNode treeNode) { refuseUnauthorizedRead(securityToken, userId, treeNode.getWikitty()); } @Override - public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { + public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { String userId = getUserId(securityToken); - Entry<TreeNode, Integer> entry = ws.restoreNode(securityToken, wikittyId, filter); + Entry<WikittyTreeNode, Integer> entry = ws.restoreNode(securityToken, wikittyId, filter); checkRestoreTreeNode(securityToken, userId, entry.getKey()); return entry; } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { String userId = getUserId(securityToken); - Map<TreeNode, Integer> children = ws.restoreChildren(securityToken, wikittyId, filter); - for (Map.Entry<TreeNode, Integer> child : children.entrySet()) { + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(securityToken, wikittyId, filter); + for (Map.Entry<WikittyTreeNode, Integer> child : children.entrySet()) { checkRestoreTreeNode(securityToken, userId, child.getKey()); } return children; @@ -545,7 +545,7 @@ @Override public List<String> deleteTree(String securityToken, String treeNodeId) { - TreeNode treeNode = ws.restoreNode(securityToken, treeNodeId, null).getKey(); + WikittyTreeNode treeNode = ws.restoreNode(securityToken, treeNodeId, null).getKey(); Collection<Wikitty> wikitties = Arrays.asList(treeNode.getWikitty()); checkStore(securityToken, wikitties); return ws.deleteTree(securityToken, treeNodeId); @@ -597,7 +597,7 @@ if (securityTokenWikitty == null) { throw new SecurityException("bad (obsolete ?) token"); } else { - result = SecurityTokenHelper.getUser(securityTokenWikitty); + result = WikittyTokenHelper.getUser(securityTokenWikitty); } } return result; Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java (from rev 415, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java 2010-10-15 17:38:43 UTC (rev 418) @@ -0,0 +1,57 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.wikitty; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class WikittyTree implements Serializable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 5785244346524975096L; + + protected WikittyTreeNode node; + protected List<WikittyTree> children; + + public void setNode(WikittyTreeNode node) { + this.node = node; + } + + public void addChild(WikittyTree tree) { + getChildren().add( tree ); + } + + public List<WikittyTree> getChildren() { + if ( children == null ) { + children = new ArrayList<WikittyTree>(); + } + return children; + } + + public String getName() { + return node.getName(); + } +} 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-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -40,8 +40,8 @@ import org.nuiton.wikitty.ExtensionFactory; import org.nuiton.wikitty.FieldType; import org.nuiton.wikitty.FieldType.TYPE; -import org.nuiton.wikitty.TreeNode; -import org.nuiton.wikitty.TreeNodeAbstract; +import org.nuiton.wikitty.WikittyTreeNode; +import org.nuiton.wikitty.WikittyTreeNodeAbstract; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; @@ -446,9 +446,9 @@ @Test public void testGeneratedExtensionType() { - 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_ATTACHMENT).getType()); + 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()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -36,7 +36,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.FieldType; -import org.nuiton.wikitty.LabelImpl; +import org.nuiton.wikitty.WikittyLabelImpl; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyUtil; @@ -465,7 +465,7 @@ } // use in testNewInstance - static class MonLabel extends LabelImpl { + static class MonLabel extends WikittyLabelImpl { } /** check that a date is the same after parse and format */ 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-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -46,17 +46,17 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.Label; +import org.nuiton.wikitty.WikittyLabel; import org.nuiton.wikitty.PagedResult; -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.UpdateResponse; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyImpl; -import org.nuiton.wikitty.WikittyLabelHelper; +import org.nuiton.wikitty.WikittyLabelUtil; import org.nuiton.wikitty.WikittyObsoleteException; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; @@ -418,22 +418,22 @@ // labelisation test Wikitty w1 = wikitties.get(0); - WikittyLabelHelper.addLabel(proxy, w1.getId(), "titi"+ts); - WikittyLabelHelper.addLabel(proxy, w1.getId(), "toto"+ts); + WikittyLabelUtil.addLabel(proxy, w1.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(proxy, w1.getId(), "toto"+ts); Wikitty w2 = wikitties.get(1); - WikittyLabelHelper.addLabel(proxy, w2.getId(), "tata"+ts); - WikittyLabelHelper.addLabel(proxy, w2.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(proxy, w2.getId(), "tata"+ts); + WikittyLabelUtil.addLabel(proxy, w2.getId(), "titi"+ts); Wikitty w3 = wikitties.get(2); - WikittyLabelHelper.addLabel(proxy, w3.getId(), "tutu"+ts); - WikittyLabelHelper.addLabel(proxy, w3.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(proxy, w3.getId(), "tutu"+ts); + WikittyLabelUtil.addLabel(proxy, w3.getId(), "titi"+ts); - Wikitty wt = WikittyLabelHelper.findByLabel(proxy, "toto"+ts ); + Wikitty wt = WikittyLabelUtil.findByLabel(proxy, "toto"+ts ); assertEquals(w1, wt); - Set<String> labels = WikittyLabelHelper.findAllAppliedLabels(proxy, w2.getId()); + Set<String> labels = WikittyLabelUtil.findAllAppliedLabels(proxy, w2.getId()); assertEquals(new HashSet(Arrays.asList("tata"+ts, "titi"+ts)), labels); } @@ -444,18 +444,18 @@ List<Wikitty> wikitties = createSampleWikitty(ws); List<Wikitty> wikittyNodes = new ArrayList<Wikitty>(); - TreeNodeImpl root = new TreeNodeImpl(); + WikittyTreeNodeImpl root = new WikittyTreeNodeImpl(); wikittyNodes.add(root.getWikitty()); root.setName("MyCategoryRoot"); for ( int i = 0; i < 3; i++ ) { - TreeNodeImpl leaf = new TreeNodeImpl(); + WikittyTreeNodeImpl leaf = new WikittyTreeNodeImpl(); wikittyNodes.add( leaf.getWikitty() ); leaf.setName( "cat-"+i ); leaf.setParent( root.getWikittyId() ); // root.addChild( leaf.getWikittyId() ); for ( int j = 0; j < 5; j++ ) { - TreeNodeImpl subLeaf = new TreeNodeImpl(); + WikittyTreeNodeImpl subLeaf = new WikittyTreeNodeImpl(); subLeaf.setName( "subcat-"+i+"-"+j ); subLeaf.setParent( leaf.getWikittyId() ); wikittyNodes.add( subLeaf.getWikitty() ); @@ -472,17 +472,17 @@ assign( table, root, "cat-1" ); assign( bureau, root, "cat-2/subcat-2-4" ); - Tree t = ws.restoreTree(null, root.getWikitty().getId() ); + WikittyTree t = ws.restoreTree(null, root.getWikitty().getId() ); t.getName().equals("MyCategoryRoot"); } - protected void assign(Wikitty wikitty, TreeNodeImpl root, String path) { + protected void assign(Wikitty wikitty, WikittyTreeNodeImpl root, String path) { String[] nodeNames = path.split("/"); - TreeNodeImpl currentNode = root; + WikittyTreeNodeImpl currentNode = root; outerloop : for( String nodeName : nodeNames ) { - TreeNodeImpl node = new TreeNodeImpl(); + WikittyTreeNodeImpl node = new WikittyTreeNodeImpl(); node.setName(nodeName); Criteria criteria = Search.query(node.getWikitty()).criteria() @@ -490,10 +490,10 @@ List<String> wikittiesId = ws.findAllByCriteria(null, criteria).getAll(); List<Wikitty> wikitties = ws.restore(null, wikittiesId); for ( Wikitty child : wikitties ) { - if (!child.hasExtension(TreeNode.EXT_TREENODE)) { + if (!child.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { continue; } - node = new TreeNodeImpl(child); + node = new WikittyTreeNodeImpl(child); if ( node.getName().equals(nodeName) ) { currentNode = node; continue outerloop; @@ -512,9 +512,9 @@ public void testWikittyUtilNewInstanceWithWikitty() { Wikitty w = new WikittyImpl(); - w.addExtension(TreeNodeImpl.extensions); + w.addExtension(WikittyTreeNodeImpl.extensions); - TreeNode treeNode = WikittyUtil.newInstance(null, ws, TreeNode.class, w); + WikittyTreeNode treeNode = WikittyUtil.newInstance(null, ws, WikittyTreeNode.class, w); Assert.assertNotNull(treeNode); } @@ -526,20 +526,20 @@ WikittyProxy wikittyProxy = new WikittyProxy(); wikittyProxy.setWikittyService(ws); - TreeNode node = new TreeNodeImpl(); + WikittyTreeNode node = new WikittyTreeNodeImpl(); node.setName("nodeName"); // cast, different business object, same wikitty - Label label = wikittyProxy.cast(node, Label.class); + WikittyLabel label = wikittyProxy.cast(node, WikittyLabel.class); label.addLabels("toto"); label = wikittyProxy.store(label); String wikittyId = label.getWikittyId(); - TreeNode node2 = wikittyProxy.restore(TreeNode.class, wikittyId); + WikittyTreeNode node2 = wikittyProxy.restore(WikittyTreeNode.class, wikittyId); Assert.assertEquals("nodeName", node2.getName()); - Label label2 = wikittyProxy.cast(node, Label.class); + WikittyLabel label2 = wikittyProxy.cast(node, WikittyLabel.class); List<String> labels = new ArrayList<String>(label2.getLabels()); Assert.assertFalse(labels.isEmpty()); Assert.assertEquals("toto", labels.get(0)); @@ -553,8 +553,8 @@ // store 1 Wikitty myWikitty = new WikittyImpl(); - myWikitty.addExtension(TreeNodeImpl.extensions); - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "name"); + myWikitty.addExtension(WikittyTreeNodeImpl.extensions); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "name"); ws.store(null, myWikitty); Assert.assertEquals("1.0", myWikitty.getVersion()); @@ -563,13 +563,13 @@ Assert.assertEquals("1.0", myWikitty.getVersion()); // store 3 : modification - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "new name"); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "new name"); ws.store(null, myWikitty); Assert.assertEquals("2.0", myWikitty.getVersion()); // store 4 : new wikitty with same wikitty id (obsolete) Wikitty myNewWikitty = new WikittyImpl(myWikitty.getId()); - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "new wikitty"); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "new wikitty"); try { ws.store(null, myNewWikitty); Assert.fail("Test must throw WikittyObsoleteException"); @@ -598,8 +598,8 @@ // store 1 Wikitty myWikitty = new WikittyImpl(); - myWikitty.addExtension(TreeNodeImpl.extensions); - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "name"); + myWikitty.addExtension(WikittyTreeNodeImpl.extensions); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "name"); ws.store(null, myWikitty); // delete 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-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -35,8 +35,8 @@ import org.nuiton.util.StringUtil; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.PagedResult; -import org.nuiton.wikitty.TreeNode; -import org.nuiton.wikitty.TreeNodeImpl; +import org.nuiton.wikitty.WikittyTreeNode; +import org.nuiton.wikitty.WikittyTreeNodeImpl; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyImportExportService; import org.nuiton.wikitty.WikittyProxy; @@ -163,7 +163,7 @@ // store required import extension WikittyProxy proxy = new WikittyProxy(ws); proxy.storeExtension(extensionClient); - proxy.storeExtension(TreeNodeImpl.extensionTreeNode); + proxy.storeExtension(WikittyTreeNodeImpl.extensionWikittyTreeNode); proxy.storeExtension(extensionTag); // declare import service @@ -185,17 +185,17 @@ Assert.assertEquals(1, pagedResult2.getNumFound()); // test non existant wikitty tree node childreen deletion - Criteria criteria3 = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_NAME, "MyTreeNode").criteria(); - PagedResult<TreeNode> pagedResult3 = proxy.findAllByCriteria(TreeNode.class, criteria3); + Criteria criteria3 = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "MyTreeNode").criteria(); + PagedResult<WikittyTreeNode> pagedResult3 = proxy.findAllByCriteria(WikittyTreeNode.class, criteria3); Assert.assertEquals(1, pagedResult3.getNumFound()); - TreeNode myTreeNode = pagedResult3.getFirst(); + WikittyTreeNode myTreeNode = pagedResult3.getFirst(); Assert.assertEquals(1, myTreeNode.getAttachment().size()); // test des requetes imbriquées - Criteria criteria4 = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, myTreeNode.getWikittyId()).criteria(); - PagedResult<TreeNode> pagedResult4 = proxy.findAllByCriteria(TreeNode.class, criteria4); + Criteria criteria4 = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, myTreeNode.getWikittyId()).criteria(); + PagedResult<WikittyTreeNode> pagedResult4 = proxy.findAllByCriteria(WikittyTreeNode.class, criteria4); Assert.assertEquals(1, pagedResult4.getNumFound()); - TreeNode mySubNode = pagedResult4.getFirst(); + WikittyTreeNode mySubNode = pagedResult4.getFirst(); Assert.assertEquals("MySubNode", mySubNode.getName()); } } Modified: trunk/wikitty-api/src/test/resources/csv/importtree.csv =================================================================== --- trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-10-15 17:38:43 UTC (rev 418) @@ -1,3 +1,3 @@ -"Wikitty.Id","Wikitty.Ext","TreeNode.name","TreeNode.parent","TreeNode.attachment" +"Wikitty.Id","Wikitty.Ext","WikittyTreeNode.name","WikittyTreeNode.parent","WikittyTreeNode.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-api/src/test/resources/csv/importtree2.csv =================================================================== --- trunk/wikitty-api/src/test/resources/csv/importtree2.csv 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/resources/csv/importtree2.csv 2010-10-15 17:38:43 UTC (rev 418) @@ -1,2 +1,2 @@ -"TreeNode.name","TreeNode.parent" -"MySubNode","TreeNode.name=MyTreeNode" +"WikittyTreeNode.name","WikittyTreeNode.parent" +"MySubNode","WikittyTreeNode.name=MyTreeNode"