r721 - in trunk: . wikitty-api/src/main/java/org/nuiton/wikitty - Wikitty-commits

23 Feb 2011

Author: bpoussin
Date: 2011-02-23 13:15:14 +0100 (Wed, 23 Feb 2011)
New Revision: 721

Url: http://nuiton.org/repositories/revision/wikitty/721

Log:
use new TimeLog class to replace TimeTrace

Modified:
   trunk/pom.xml
   trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java

Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2011-02-23 10:01:28 UTC (rev 720)
+++ trunk/pom.xml	2011-02-23 12:15:14 UTC (rev 721)
@@ -508,7 +508,7 @@
 
     <!-- common versions used in sub-poms -->
     <eugeneVersion>2.3.1</eugeneVersion>
-    <nuitonUtilsVersion>2.0</nuitonUtilsVersion>
+    <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion>
     <nuitonI18nVersion>2.2</nuitonI18nVersion>
     <processPluginVersion>1.1</processPluginVersion>
 

Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java
===================================================================
--- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java	2011-02-23 10:01:28 UTC (rev 720)
+++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java	2011-02-23 12:15:14 UTC (rev 721)
@@ -29,7 +29,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.ApplicationConfig;
-import org.nuiton.util.TimeTrace;
+import org.nuiton.util.TimeLog;
 import org.nuiton.wikitty.entities.BusinessEntity;
 import org.nuiton.wikitty.entities.BusinessEntityImpl;
 import org.nuiton.wikitty.entities.Wikitty;
@@ -69,10 +69,9 @@
 public class WikittyProxy {
 
     /** to use log facility, just put in your code: log.info(\"...\"); */
-    static private Log log = LogFactory.getLog(WikittyProxy.class);
+    final static private Log log = LogFactory.getLog(WikittyProxy.class);
+    final static private TimeLog timeLog = new TimeLog(WikittyProxy.class);
 
-    static protected TimeTrace timeTrace = new TimeTrace();
-
     /** Delegated wikitty service. */
     protected WikittyServiceEnhanced wikittyService;
 
@@ -95,8 +94,8 @@
                     WIKITTY_PROXY_TIME_TO_LOG_INFO.getKey());
             long timeToLogWarn = config.getOptionAsInt(WikittyConfig.WikittyOption.
                     WIKITTY_PROXY_TIME_TO_LOG_WARN.getKey());
-            timeTrace.setTimeToLogInfo(timeToLogInfo);
-            timeTrace.setTimeToLogWarn(timeToLogWarn);
+            timeLog.setTimeToLogInfo(timeToLogInfo);
+            timeLog.setTimeToLogWarn(timeToLogWarn);
         }
     }
 
@@ -115,27 +114,27 @@
         setWikittyService(wikittyService);
     }
 
-    static public TimeTrace getTimeTrace() {
-        return timeTrace;
+    static public TimeLog getTimeTrace() {
+        return timeLog;
     }
 
-    static public Map<String, TimeTrace.CallStat> getCallCount() {
-        return timeTrace.getCallCount();
+    static public Map<String, TimeLog.CallStat> getCallCount() {
+        return timeLog.getCallCount();
     }
 
     public void login(String login, String password) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         String result = wikittyService.login(login, password);
         setSecurityToken(result);
         
-        timeTrace.add(start, "login");
+        timeLog.log(start, "login");
     }
 
     public void logout() {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         wikittyService.logout(securityToken);
         
-        timeTrace.add(start, "logout");
+        timeLog.log(start, "logout");
     }
 
     public String getSecurityToken() {
@@ -163,11 +162,11 @@
      * @return new instance of object wanted
      */
     public <E extends BusinessEntity> E cast(BusinessEntity source, Class<E> target) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         E result = WikittyUtil.newInstance(
                 securityToken, wikittyService, target, ((BusinessEntityImpl)source).getWikitty());
         
-        timeTrace.add(start, "cast");
+        timeLog.log(start, "cast");
         return result;
     }
 
@@ -178,12 +177,12 @@
     }
 
     public Wikitty store(Wikitty w) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         WikittyEvent resp = wikittyService.store(securityToken, w);
         // update object
         resp.update(w);
         
-        timeTrace.add(start, "store");
+        timeLog.log(start, "store");
         return w;
     }
 
@@ -196,7 +195,7 @@
      * @return updated objects list
      */
     public <E extends BusinessEntity> List<E> store(List<E> objets) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         // prepare data to send to service
         List<Wikitty> wikitties = new ArrayList<Wikitty>(objets.size());
         for (E e : objets) {
@@ -212,12 +211,12 @@
             resp.update(w);
         }
 
-        timeTrace.add(start, "store<list>");
+        timeLog.log(start, "store<list>");
         return objets;
     }
 
     public  List<Wikitty> storeWikitty(List<Wikitty> wikitties) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
         // call the service with Wikitty
         WikittyEvent resp = wikittyService.store(securityToken, wikitties);
@@ -227,7 +226,7 @@
             resp.update(w);
         }
 
-        timeTrace.add(start, "storeWikitty<list>");
+        timeLog.log(start, "storeWikitty<list>");
         return wikitties;
     }
 
@@ -243,7 +242,7 @@
      */
     public <E extends BusinessEntity> E restore(Class<E> clazz, String id, boolean checkExtension) {
         try {
-            long start = TimeTrace.getTime();
+            long start = TimeLog.getTime();
             E result = null;
             if (id != null) {
                 HashSet<String> extNames = null;
@@ -274,7 +273,7 @@
                 }
             }
             
-            timeTrace.add(start, "restore<Business>");
+            timeLog.log(start, "restore<Business>");
             return result;
         } catch (SecurityException eee) {
             throw eee;
@@ -290,13 +289,13 @@
      * @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 = TimeLog.getTime();
         Wikitty result = null;
         if (id != null) {
             result = wikittyService.restore(securityToken, id);
         }
         
-        timeTrace.add(start, "restore");
+        timeLog.log(start, "restore");
     	return result;
     }
     
@@ -320,11 +319,11 @@
      * @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 = TimeLog.getTime();
 
         List<Wikitty> result = wikittyService.restore(securityToken, id);
 
-        timeTrace.add(start, "restoreWikitty<list>");
+        timeLog.log(start, "restoreWikitty<list>");
         return result;
     }
 
@@ -341,7 +340,7 @@
      */
     public <E extends BusinessEntity> List<E> restore(
             Class<E> clazz, List<String> id, boolean checkExtension) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
         List<Wikitty> wikitties = wikittyService.restore(securityToken, id);
         List<E> result = new ArrayList<E>();
@@ -375,7 +374,7 @@
             result.add(dto);
         }
         
-        timeTrace.add(start, "restore<list>");
+        timeLog.log(start, "restore<list>");
         return result;
     }
 
@@ -385,30 +384,30 @@
     }
 
     public void delete(String id) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         wikittyService.delete(securityToken, id);
 
-        timeTrace.add(start, "delete");
+        timeLog.log(start, "delete");
     }
 
     public <E extends BusinessEntity> void delete(E object) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         if (object != null) {
             String id = object.getWikittyId();
             wikittyService.delete(securityToken, id);
         }
-        timeTrace.add(start, "delete(BusinessEntity)");
+        timeLog.log(start, "delete(BusinessEntity)");
     }
 
     public void delete(Collection<String> ids) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         wikittyService.delete(securityToken, ids);
         
-        timeTrace.add(start, "delete<list>");
+        timeLog.log(start, "delete<list>");
     }
 
     public <E extends BusinessEntity> void delete(List<E> objets) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         
         // prepare data to send to service
         List<String> ids = new ArrayList<String>(objets.size());
@@ -422,7 +421,7 @@
         // call the service with Wikitty
         wikittyService.delete(securityToken, ids);
 
-        timeTrace.add(start, "delete<list<BusinessEntity>>");
+        timeLog.log(start, "delete<list<BusinessEntity>>");
     }
 
     /**
@@ -436,7 +435,7 @@
      */
     public <E extends BusinessEntityImpl> PagedResult<E> findAllByExample(E e,
             int firstIndex, int endIndex, String ... fieldFacet ) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
         Criteria criteria = Search.query(e.getWikitty()).criteria()
                 .setFirstIndex(firstIndex).setEndIndex(endIndex)
@@ -449,7 +448,7 @@
         PagedResult<E> result = (PagedResult<E>)pagedResult.cast(
                 this, e.getClass(), true);
         
-        timeTrace.add(start, "findAllByExample<limit>");
+        timeLog.log(start, "findAllByExample<limit>");
         return result;
     }
 
@@ -460,7 +459,7 @@
      * @return
      */
     public <E extends BusinessEntityImpl> E findByExample(E e) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         Criteria criteria = Search.query(e.getWikitty()).criteria();
 
         String id = wikittyService.findByCriteria(securityToken, criteria);
@@ -471,7 +470,7 @@
                     securityToken, wikittyService, e.getClass(), w);
         }
         
-        timeTrace.add(start, "findByExample");
+        timeLog.log(start, "findByExample");
         return result;
     }
 
@@ -487,7 +486,7 @@
      */
     public <E extends BusinessEntity> PagedResult<E> findAllByCriteria(
             Class<E> clazz, Criteria criteria) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
         // newInstance only return BusinessEntityWikittyImpl
         BusinessEntityImpl sample =
@@ -543,24 +542,24 @@
         PagedResult<E> result = (PagedResult<E>)pagedResult.cast(
                 this, sample.getClass(), true);
         
-        timeTrace.add(start, "findAllByCriteria<Business>");
+        timeLog.log(start, "findAllByCriteria<Business>");
         return result;
     }
 
     public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
     	PagedResult<String> resultId = wikittyService.findAllByCriteria(securityToken, criteria);
     	PagedResult<Wikitty> result = resultId.cast(securityToken, wikittyService);
 
-        timeTrace.add(start, "findAllByCriteria");
+        timeLog.log(start, "findAllByCriteria");
     	return result;
     }
 
     public PagedResult<String> findAllIdByCriteria(Criteria criteria) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
     	PagedResult<String> result = wikittyService.findAllByCriteria(securityToken, criteria);
 
-        timeTrace.add(start, "findAllByCriteria");
+        timeLog.log(start, "findAllByCriteria");
     	return result;
     }
 
@@ -583,7 +582,7 @@
      */
     public TreeNodeResult<Wikitty> findTreeNode(
             String wikittyId, int depth, boolean count, Criteria filter) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
     	TreeNodeResult<String> resultId = wikittyService.findTreeNode(
                 securityToken, wikittyId, depth, count, filter);
@@ -603,7 +602,7 @@
         resultId.acceptVisitor(convertVisitor);
 
     	TreeNodeResult<Wikitty> result = convertVisitor.getTree();
-        timeTrace.add(start, "findTreeNode<Wikitty>");
+        timeLog.log(start, "findTreeNode<Wikitty>");
     	return result;
     }
 
@@ -626,7 +625,7 @@
     public <E extends BusinessEntity> TreeNodeResult<E> findTreeNode(
             Class<E> clazz, String wikittyId, int depth,
             boolean count, Criteria filter) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
     	TreeNodeResult<String> resultId = wikittyService.findTreeNode(
                 securityToken, wikittyId, depth, count, filter);
@@ -646,7 +645,7 @@
         resultId.acceptVisitor(convertVisitor);
 
     	TreeNodeResult<E> result = convertVisitor.getTree();
-        timeTrace.add(start, "findTreeNode");
+        timeLog.log(start, "findTreeNode");
     	return result;
     }
 
@@ -771,16 +770,16 @@
      */
     public TreeNodeResult<String> findAllIdTreeNode(
             String wikittyId, int depth, boolean count, Criteria filter) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
     	TreeNodeResult<String> result = wikittyService.findTreeNode(
                 securityToken, wikittyId, depth, count, filter);
 
-        timeTrace.add(start, "findAllIdTreeNode");
+        timeLog.log(start, "findAllIdTreeNode");
     	return result;
     }
 
     public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         BusinessEntityImpl sample =
                 (BusinessEntityImpl)WikittyUtil.newInstance(clazz);
 
@@ -796,15 +795,15 @@
         E result = WikittyUtil.newInstance(
                 securityToken, wikittyService, clazz, w);
         
-        timeTrace.add(start, "findByCriteria<Business>");
+        timeLog.log(start, "findByCriteria<Business>");
         return result;
     }
 
     public Wikitty findByCriteria(Criteria criteria) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         String id = wikittyService.findByCriteria(securityToken, criteria);
         Wikitty wikitty = wikittyService.restore(securityToken, id);
-        timeTrace.add(start, "findByCriteria");
+        timeLog.log(start, "findByCriteria");
     	return wikitty;
     }
     
@@ -815,10 +814,10 @@
      * @return {@true} if at least one node has been deleted
      */
     public WikittyEvent deleteTree(String treeNodeId) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         WikittyEvent result = wikittyService.deleteTree(securityToken,treeNodeId);
         
-        timeTrace.add(start, "deleteTree");
+        timeLog.log(start, "deleteTree");
         return result;
     }
 
@@ -836,13 +835,13 @@
     @Deprecated
     public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode(
             Class<E> clazz, String wikittyId, Criteria filter) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
         TreeNodeResult<E> tree = findTreeNode(clazz, wikittyId, 0, true, filter);
         Map.Entry<E, Integer> result = new SimpleEntry<E, Integer>(
                 tree.getObject(), tree.getAttCount());
         
-        timeTrace.add(start, "restoreNode");
+        timeLog.log(start, "restoreNode");
     	return result;
     }
 
@@ -879,7 +878,7 @@
     @Deprecated
     public <E extends BusinessEntity> Map<E, Integer> findTreeNode(
             Class<E> clazz, String wikittyId, Criteria filter) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
         TreeNodeResult<E> tree = findTreeNode(clazz, wikittyId, 1, true, filter);
 
@@ -888,7 +887,7 @@
             result.put(child.getObject(), child.getAttCount());
         }
 
-        timeTrace.add(start, "findTreeNode");
+        timeLog.log(start, "findTreeNode");
         return result;
     }
 
@@ -907,17 +906,17 @@
     }
 
     public Wikitty restoreVersion(String wikittyId, String version) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         Wikitty result = wikittyService.restoreVersion(
                 securityToken, wikittyId, version);
         
-        timeTrace.add(start, "restoreVersion");
+        timeLog.log(start, "restoreVersion");
         return result;
     }
 
     public <E extends BusinessEntity> boolean hasType(Class<E> clazz, String wikittyId) {
         try {
-            long start = TimeTrace.getTime();
+            long start = TimeLog.getTime();
             
             boolean result = true;
 
@@ -943,7 +942,7 @@
                 }
             }
             
-            timeTrace.add(start, "hasType");
+            timeLog.log(start, "hasType");
             return result;
         } catch (SecurityException eee) {
             throw eee;
@@ -960,11 +959,11 @@
      * @return update response
      */
     public WikittyEvent storeExtension(WikittyExtension ext) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         WikittyEvent response =
                 wikittyService.storeExtension(securityToken, ext);
         
-        timeTrace.add(start, "storeExtension");
+        timeLog.log(start, "storeExtension");
         return response;
     }
 
@@ -975,11 +974,11 @@
      * @return update response
      */
     public WikittyEvent storeExtension(Collection<WikittyExtension> exts) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         WikittyEvent response =
                 wikittyService.storeExtension(securityToken, exts);
         
-        timeTrace.add(start, "storeExtension<list>");
+        timeLog.log(start, "storeExtension<list>");
         return response;
     }
 
@@ -990,10 +989,10 @@
      * @return the corresponding object, exception if no such object found.
      */
     public WikittyExtension restoreExtension(String extensionId) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         WikittyExtension extension = wikittyService.restoreExtension(securityToken, extensionId);
         
-        timeTrace.add(start, "restoreExtension");
+        timeLog.log(start, "restoreExtension");
         return extension;
     }
 
@@ -1004,25 +1003,25 @@
      * @return the corresponding object, exception if no such object found.
      */
     public WikittyExtension restoreExtensionLastVersion(String extensionName) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         WikittyExtension extension = wikittyService.restoreExtensionLastVersion(securityToken, extensionName);
         
-        timeTrace.add(start, "restoreExtensionLastVersion");
+        timeLog.log(start, "restoreExtensionLastVersion");
         return extension;
     }
 
     public void deleteExtension(String extName) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         wikittyService.deleteExtension(securityToken, extName);
 
-        timeTrace.add(start, "deleteExtension");
+        timeLog.log(start, "deleteExtension");
     }
 
     public void deleteExtension(Collection<String> extNames) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         wikittyService.deleteExtension(securityToken, extNames);
 
-        timeTrace.add(start, "deleteExtension<list>");
+        timeLog.log(start, "deleteExtension<list>");
     }
 
     /**
@@ -1031,10 +1030,10 @@
      * @return extension id list
      */
     public List<String> getAllExtensionIds() {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         List<String> result = wikittyService.getAllExtensionIds(securityToken);
         
-        timeTrace.add(start, "getAllExtensionIds");
+        timeLog.log(start, "getAllExtensionIds");
         return result;
     }
     
@@ -1046,10 +1045,10 @@
      * @return extensions
      */
     public List<String> getAllExtensionsRequires(String extensionName) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         List<String> result = wikittyService.getAllExtensionsRequires(securityToken, extensionName);
         
-        timeTrace.add(start, "getAllExtensionsRequires");
+        timeLog.log(start, "getAllExtensionsRequires");
         return result;
     }
 
@@ -1058,10 +1057,10 @@
      * This operation should be disabled in production environment.
      */
     public WikittyEvent clear() {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         WikittyEvent result = wikittyService.clear(securityToken);
         
-        timeTrace.add(start, "clear");
+        timeLog.log(start, "clear");
         return result;
     }
 
@@ -1070,10 +1069,10 @@
      * reindex all object.
      */
     public void syncSearchEngine() {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         wikittyService.syncSearchEngine(securityToken);
         
-        timeTrace.add(start, "syncSearchEngine");
+        timeLog.log(start, "syncSearchEngine");
     }
 
     /**
@@ -1082,10 +1081,10 @@
      * @return the wikitty encapsulated
      */
     public Wikitty getWikitty(BusinessEntity entity){
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         Wikitty result = WikittyUtil.getWikitty(wikittyService, securityToken, entity);
         
-        timeTrace.add(start, "getWikitty");
+        timeLog.log(start, "getWikitty");
         return result;
     }
 
@@ -1096,7 +1095,7 @@
      * @return true is the logged in user is in the group
      */
     public boolean isMember(String groupName) {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
         boolean result = false;
 
         WikittyUser user = getLoggedInUser();
@@ -1114,7 +1113,7 @@
                     user.getWikittyId(), group.getId());
         }
 
-        timeTrace.add(start, "isMember");
+        timeLog.log(start, "isMember");
         return result;
     }
 
@@ -1124,14 +1123,14 @@
      * @return the logged in #WikittyUser
      */
     public WikittyUser getLoggedInUser() {
-        long start = TimeTrace.getTime();
+        long start = TimeLog.getTime();
 
         String userId = WikittySecurityUtil.getUserForToken(wikittyService,
                 securityToken);
 
         WikittyUser user = restore(WikittyUser.class, userId);
 
-        timeTrace.add(start, "getLoggedInUser");
+        timeLog.log(start, "getLoggedInUser");
         return user;
     }

    

r721 - in trunk: . wikitty-api/src/main/java/org/nuiton/wikitty

bpoussin＠users.nuiton.org

tags

participants (1)