Author: jcouteau Date: 2010-12-21 15:04:26 +0100 (Tue, 21 Dec 2010) New Revision: 638 Url: http://nuiton.org/repositories/revision/wikitty/638 Log: Use Static method instead of instance one Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-12-21 13:06:19 UTC (rev 637) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-12-21 14:04:26 UTC (rev 638) @@ -35,7 +35,6 @@ import org.nuiton.wikitty.services.WikittyEvent; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -44,7 +43,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -58,7 +56,7 @@ * Wikitty proxy is used to transform wikitty object used by {@link WikittyService} * into business objects used by applications. * - * It also manage {@link #securityToken} for {@link WikittyServiceSecurity}. + * It also manage {@link #securityToken} for {@link org.nuiton.wikitty.services.WikittyServiceSecurity}. * * @author poussin * @version $Revision$ @@ -79,7 +77,7 @@ /** * Security token. * - * @see WikittyServiceSecurity#login(String, String) + * @see org.nuiton.wikitty.services.WikittyServiceSecurity#login(String, String) */ protected String securityToken; @@ -124,7 +122,7 @@ } public String login(String login, String password) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); String result = wikittyService.login(login, password); setSecurityToken(result); @@ -133,7 +131,7 @@ } public void logout() { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); wikittyService.logout(securityToken); timeTrace.add(start, "logout"); @@ -164,7 +162,7 @@ * @return new instance of object wanted */ public <E extends BusinessEntity> E cast(BusinessEntity source, Class<E> target) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); E result = WikittyUtil.newInstance( securityToken, wikittyService, target, ((BusinessEntityImpl)source).getWikitty()); @@ -179,7 +177,7 @@ } public Wikitty store(Wikitty w) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyEvent resp = wikittyService.store(securityToken, w); // update object resp.update(w); @@ -197,7 +195,7 @@ * @return updated objects list */ public <E extends BusinessEntity> List<E> store(List<E> objets) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); // prepare data to send to service List<Wikitty> wikitties = new ArrayList<Wikitty>(objets.size()); for (E e : objets) { @@ -218,7 +216,7 @@ } public List<Wikitty> storeWikitty(List<Wikitty> wikitties) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); // call the service with Wikitty WikittyEvent resp = wikittyService.store(securityToken, wikitties); @@ -244,7 +242,7 @@ */ public <E extends BusinessEntity> E restore(Class<E> clazz, String id, boolean checkExtension) { try { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); E result = null; if (id != null) { HashSet<String> extNames = null; @@ -291,7 +289,7 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public Wikitty restore(String id) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Wikitty result = null; if (id != null) { result = wikittyService.restore(securityToken, id); @@ -321,7 +319,7 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public List<Wikitty> restore(List<String> id) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); List<Wikitty> result = wikittyService.restore(securityToken, id); @@ -340,7 +338,7 @@ */ public <E extends BusinessEntity> List<E> restore( Class<E> clazz, List<String> id, boolean checkExtension) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); List<Wikitty> wikitties = wikittyService.restore(securityToken, id); List<E> result = new ArrayList<E>(); @@ -384,14 +382,14 @@ } public void delete(String id) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); wikittyService.delete(securityToken, id); timeTrace.add(start, "delete"); } public void delete(Collection<String> ids) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); wikittyService.delete(securityToken, ids); timeTrace.add(start, "delete<list>"); @@ -408,7 +406,7 @@ */ public <E extends BusinessEntityImpl> PagedResult<E> findAllByExample(E e, int firstIndex, int endIndex, String ... fieldFacet ) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Criteria criteria = Search.query(e.getWikitty()).criteria() .setFirstIndex(firstIndex).setEndIndex(endIndex) @@ -432,7 +430,7 @@ * @return */ public <E extends BusinessEntityImpl> E findByExample(E e) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Criteria criteria = Search.query(e.getWikitty()).criteria(); Wikitty w = wikittyService.findByCriteria(securityToken, criteria); @@ -458,7 +456,7 @@ */ public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); // newInstance only return BusinessEntityWikittyImpl BusinessEntityImpl sample = @@ -519,7 +517,7 @@ } public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); PagedResult<String> resultId = wikittyService.findAllByCriteria(securityToken, criteria); PagedResult<Wikitty> result = resultId.cast(securityToken, wikittyService); @@ -528,7 +526,7 @@ } public PagedResult<String> findAllIdByCriteria(Criteria criteria) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); PagedResult<String> result = wikittyService.findAllByCriteria(securityToken, criteria); timeTrace.add(start, "findAllByCriteria"); @@ -536,7 +534,7 @@ } public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); BusinessEntityImpl sample = (BusinessEntityImpl)WikittyUtil.newInstance(clazz); @@ -556,7 +554,7 @@ } public Wikitty findByCriteria(Criteria criteria) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Wikitty wikitty = wikittyService.findByCriteria(securityToken, criteria); timeTrace.add(start, "findByCriteria"); @@ -564,7 +562,7 @@ } public WikittyTree restoreTree(String wikittyId) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyTree result = wikittyService.restoreTree(securityToken, wikittyId); timeTrace.add(start, "restoreTree"); @@ -578,7 +576,7 @@ * @return {@true} if at least one node has been deleted */ public WikittyEvent deleteTree(String treeNodeId) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyEvent result = wikittyService.deleteTree(securityToken,treeNodeId); timeTrace.add(start, "deleteTree"); @@ -593,7 +591,7 @@ public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode( Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Map.Entry<E, Integer> result = null; Map.Entry<WikittyTreeNode, Integer> node = wikittyService.restoreNode( @@ -617,7 +615,7 @@ public <E extends BusinessEntity> Map<E, Integer> restoreChildren( Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Map<E, Integer> convertedResult = null; @@ -634,7 +632,7 @@ //TODO EC-20100420 was : String nodeId = node.getId(); String nodeId = node.getWikittyId(); - E businessEntity = null; + E businessEntity; HashSet<String> extNames = null; try { Wikitty wikitty = wikittyService.restore(securityToken, nodeId); @@ -681,7 +679,7 @@ } public Wikitty restoreVersion(String wikittyId, String version) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Wikitty result = wikittyService.restoreVersion( securityToken, wikittyId, version); @@ -691,12 +689,12 @@ public <E extends BusinessEntity> boolean hasType(Class<E> clazz, String wikittyId) { try { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); boolean result = true; - E businessObject = null; - HashSet<String> extNames = null; + E businessObject; + HashSet<String> extNames; Wikitty wikitty = wikittyService.restore(securityToken, wikittyId); if (wikitty == null) { result = false; @@ -734,7 +732,7 @@ * @return update response */ public WikittyEvent storeExtension(WikittyExtension ext) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyEvent response = wikittyService.storeExtension(securityToken, ext); @@ -749,7 +747,7 @@ * @return update response */ public WikittyEvent storeExtension(Collection<WikittyExtension> exts) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyEvent response = wikittyService.storeExtension(securityToken, exts); @@ -764,7 +762,7 @@ * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtension(String extensionId) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyExtension extension = wikittyService.restoreExtension(securityToken, extensionId); timeTrace.add(start, "restoreExtension"); @@ -778,7 +776,7 @@ * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtensionLastVersion(String extensionName) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyExtension extension = wikittyService.restoreExtensionLastVersion(securityToken, extensionName); timeTrace.add(start, "restoreExtensionLastVersion"); @@ -786,14 +784,14 @@ } public void deleteExtension(String extName) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); wikittyService.deleteExtension(securityToken, extName); timeTrace.add(start, "deleteExtension"); } public void deleteExtension(Collection<String> extNames) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); wikittyService.deleteExtension(securityToken, extNames); timeTrace.add(start, "deleteExtension<list>"); @@ -805,7 +803,7 @@ * @return extension id list */ public List<String> getAllExtensionIds() { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); List<String> result = wikittyService.getAllExtensionIds(securityToken); timeTrace.add(start, "getAllExtensionIds"); @@ -820,7 +818,7 @@ * @return extensions */ public List<String> getAllExtensionsRequires(String extensionName) { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); List<String> result = wikittyService.getAllExtensionsRequires(securityToken, extensionName); timeTrace.add(start, "getAllExtensionsRequires"); @@ -832,7 +830,7 @@ * This operation should be disabled in production environment. */ public WikittyEvent clear() { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); WikittyEvent result = wikittyService.clear(securityToken); timeTrace.add(start, "clear"); @@ -842,11 +840,9 @@ /** * Synchronize search engine with wikitty storage engine, i.e. clear and * reindex all wikitties. - * - * @return update response */ public void syncSearchEngine() { - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); wikittyService.syncSearchEngine(securityToken); timeTrace.add(start, "syncSearchEngine"); @@ -858,7 +854,7 @@ * @return the wikitty encapsulated */ public Wikitty getWikitty(BusinessEntity entity){ - long start = timeTrace.getTime(); + long start = TimeTrace.getTime(); Wikitty result = WikittyUtil.getWikitty(wikittyService, securityToken, entity); timeTrace.add(start, "getWikitty");