Author: bpoussin Date: 2010-10-29 04:12:48 +0200 (Fri, 29 Oct 2010) New Revision: 458 Url: http://nuiton.org/repositories/revision/wikitty/458 Log: utilisation de WikittyServiceTransaction pour l'import suppression dans WikittyService (et d'autres classes) de toute reference a WikittyTransaction http://www.nuiton.org/issues/show/1000 Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.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/WikittyServiceEnhanced.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/java/org/nuiton/wikitty/WikittyServiceTransaction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyServiceTransactionTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.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/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-10-29 02:12:48 UTC (rev 458) @@ -101,46 +101,14 @@ /** * Convert all result to the wikitty type and return new PagedResult with * this new result list. - * - * @param securityToken security token - * @param ws wikitty service - * @return new PagedResult, this result can have less elements that original - * for some reason (security, ...) - */ - public PagedResult<Wikitty> cast(String securityToken, WikittyService ws) { - List<Wikitty> castedResult; - - if (results.size() == 0) { - castedResult = new ArrayList<Wikitty>(); - } else { - if (results.get(0) instanceof String) { - // le pagedresult courant contient des Ids - // Si ce n'est pas le cas, ca veut dire que le developpeur utilisant - // ce PagedResult ne sait pas ce qu'il fait :) - List<String> ids = (List<String>) results; - castedResult = ws.restore(securityToken, null, ids); - } else { - throw new ClassCastException("PagedResult don't contains" + - " wikitty String id but " + results.get(0).getClass()); - } - } - PagedResult<Wikitty> result = new PagedResult<Wikitty>( - firstIndice, numFound, queryString, facets, castedResult); - return result; - } - - /** - * Convert all result to the wikitty type and return new PagedResult with - * this new result list. * * @param securityToken security token * @param ws wikitty service - * @param transaction transaction * * @return new PagedResult, this result can have less elements that original * for some reason (security, ...) */ - public PagedResult<Wikitty> cast(String securityToken, WikittyService ws, WikittyTransaction transaction) { + public PagedResult<Wikitty> cast(String securityToken, WikittyService ws) { List<Wikitty> castedResult; if (results.size() == 0) { @@ -151,7 +119,7 @@ // Si ce n'est pas le cas, ca veut dire que le developpeur utilisant // ce PagedResult ne sait pas ce qu'il fait :) List<String> ids = (List<String>) results; - castedResult = ws.restore(securityToken, transaction, ids); + castedResult = ws.restore(securityToken, ids); } else { throw new ClassCastException("PagedResult don't contains" + " wikitty String id but " + results.get(0).getClass()); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-10-29 02:12:48 UTC (rev 458) @@ -190,14 +190,6 @@ } /* - * @see org.nuiton.wikitty.WikittyServiceListener#removeExtension(java.lang.String[]) - */ - @Override - public void removeExtension(WikittyServiceEvent event) { - - } - - /* * @see org.nuiton.wikitty.WikittyServiceListener#clearExtension() */ @Override Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java 2010-10-29 02:12:48 UTC (rev 458) @@ -51,7 +51,6 @@ * Migrate wikitty data from oldExt version to newExt. * * @param service Wikitty service that do migration - * @param transaction current transaction to use * @param wikitty Wikitty object that contains data in old version * extension format * @param oldExt old extension definition @@ -59,7 +58,7 @@ * @return same wikitty as argument if nothing to do, or new wikitty * if some modification is done */ - public Wikitty migrate(WikittyService service, WikittyTransaction transaction, - Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt); + public Wikitty migrate(WikittyService service, Wikitty wikitty, + WikittyExtension oldExt, WikittyExtension newExt); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java 2010-10-29 02:12:48 UTC (rev 458) @@ -58,16 +58,16 @@ * @param wikitty wikitty to add extension to * @param newExt extension to add */ - protected void addExtension(WikittyService service, WikittyTransaction transaction, Wikitty wikitty, WikittyExtension newExt) { + protected void addExtension( + WikittyService service, Wikitty wikitty, WikittyExtension newExt) { // manage requires before current String requires = newExt.getRequires(); if (StringUtils.isNotEmpty(requires)) { for (String require : requires.split(",")) { WikittyExtension newRequireExt = - service.restoreExtensionLastVersion( - null, transaction, require); - addExtension(service, transaction, wikitty, newRequireExt); + service.restoreExtensionLastVersion(null, require); + addExtension(service, wikitty, newRequireExt); } } @@ -76,7 +76,8 @@ } @Override - public Wikitty migrate(WikittyService service, WikittyTransaction transaction, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { + public Wikitty migrate(WikittyService service, Wikitty wikitty, + WikittyExtension oldExt, WikittyExtension newExt) { String wikittyId = wikitty.getId(); String wikittyVersion = wikitty.getVersion(); @@ -90,10 +91,10 @@ // during loop add new when old one is found if (extension.equals(oldExt)) { - addExtension(service, transaction, result, newExt); + addExtension(service, result, newExt); } else { - addExtension(service, transaction, result, extension); + addExtension(service, result, extension); } } 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-29 02:12:48 UTC (rev 458) @@ -195,19 +195,16 @@ String securityToken, List<WikittyServiceEvent> events); /** - * Manage Update and creation, action is done in transaction passed in - * argument. + * Manage Update and creation. * * @param securityToken security token - * @param transaction transaction used to do the action (can be null, if we - * want new transaction) * @param wikitties list of wikitty to be persisted * @param force boolean force non version version increment on saved wikitty * or force version on wikitty creation (version 0.0) * @return update response */ - public WikittyServiceEvent store(String securityToken, WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean force); + public WikittyServiceEvent store( + String securityToken, Collection<Wikitty> wikitties, boolean force); /** * Return all extension id (ex: "extName[version])"). @@ -228,56 +225,45 @@ public List<String> getAllExtensionsRequires(String securityToken, String extensionName); /** - * Manage Update and creation, action is done in transaction passed in - * argument + * Manage Update and creation * * @param securityToken security token - * @param transaction transaction used to do the action (can be null if we - * want new transaction) * @param exts list of wikitty extension to be persisted * @return update response */ - public WikittyServiceEvent storeExtension(String securityToken, - WikittyTransaction transaction, Collection<WikittyExtension> exts); + public WikittyServiceEvent storeExtension( + String securityToken, Collection<WikittyExtension> exts); /** * Load extension from id. Id is 'name[version]'. - * Action is done in transaction passed in argument. * * @param securityToken security token - * @param transaction transaction used to do the action (can be null if we - * want new transaction) * @param extensionId * @return the corresponding object, exception if no such object found. */ - public WikittyExtension restoreExtension(String securityToken, - WikittyTransaction transaction, String extensionId); + public WikittyExtension restoreExtension( + String securityToken, String extensionId); /** * Search extension with name in last version. * * @param securityToken security token - * @param transaction transaction used to do the action (can be null if we - * want new transaction) * @param name extension name * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtensionLastVersion( - String securityToken, WikittyTransaction transaction, String name); + String securityToken, String name); /** - * Restore wikitty using opened transaction. + * Restore wikitty * * @param securityToken security token - * @param transaction transaction to use (can be null if we - * want new transaction) * @param id list of wikitty ids to restore * @return list of corresponding wikitty, if one id is not valid (no object * or deleted or no authorisation) this id return null and result list can * have null elements */ - public List<Wikitty> restore(String securityToken, - WikittyTransaction transaction, List<String> id); + public List<Wikitty> restore(String securityToken, List<String> id); /** * Delete all object if id exists. @@ -290,13 +276,11 @@ /** * * @param securityToken security token - * @param transaction (can be null if we - * want new transaction) * @param criteria * @return */ - public PagedResult<String> findAllByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria); + public PagedResult<String> findAllByCriteria( + String securityToken, Criteria criteria); /** * First lonely (or first one) wikitty object that match criteria, if no @@ -305,12 +289,9 @@ * * @param securityToken security token * @param criteria - * @param transaction (can be null if we - * want new transaction) * @return wikitty object or null */ - public Wikitty findByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria); + public Wikitty findByCriteria(String securityToken, Criteria criteria); /* * Classification @@ -344,8 +325,8 @@ * @param wikittyId * @return */ - public Map.Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, - String wikittyId, Criteria filter); + public Map.Entry<WikittyTreeNode, Integer> restoreNode( + String securityToken, String wikittyId, Criteria filter); /** * Retrieve all wikitties children with count (no recursively) of an other one @@ -355,8 +336,8 @@ * @param wikittyId * @return */ - public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, - String wikittyId, Criteria filter); + public Map<WikittyTreeNode, Integer> restoreChildren( + String securityToken, String wikittyId, Criteria filter); /* @@ -369,8 +350,8 @@ * * @param securityToken security token */ - public Wikitty restoreVersion(String securityToken, - String wikittyId, String version); + public Wikitty restoreVersion( + String securityToken, String wikittyId, String version); /* * admin 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-10-29 02:12:48 UTC (rev 458) @@ -50,20 +50,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceCached.class); - // FIXME REMOVE IT -// /** -// * Utiliser pour mettre à jour le cache en ecoutant les evenements -// * sur le service. -// * -// * Le service {@link #ws} doit supporter l'enregistrement de listener. -// */ -// static public final String WIKITTY_CACHE_LISTEN_REMOTEEVENTS = -// "wikitty.service.cache.listenevents"; -// -// /** used as property name in props given in the constructor */ -// public static final String WIKITTY_CACHE_RESTORE_COPIES = -// "wikitty.service.cache.allwaysRestoreCopies"; - /** Cache. */ protected WikittyCache cache = null; @@ -206,12 +192,11 @@ * @return */ @Override - public PagedResult<String> findAllByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { - // if we want to add cache for this method, we must use - // transaction.getCache(), and we must clear cache when + public PagedResult<String> findAllByCriteria( + String securityToken, Criteria criteria) { + // if we want to add cache for this method, we must clear cache when // addLabel, store, storeExtension are called - return ws.findAllByCriteria(securityToken, transaction, criteria); + return ws.findAllByCriteria(securityToken, criteria); } /** @@ -224,11 +209,10 @@ * @return */ @Override - public Wikitty findByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { + public Wikitty findByCriteria(String securityToken, Criteria criteria) { // if we want to add cache for this method, we must clear cache when // addLabel, store, storeExtension are called - return ws.findByCriteria(securityToken, transaction, criteria); + return ws.findByCriteria(securityToken, criteria); } /** @@ -259,12 +243,11 @@ * Overriden to put all restored object from server in cache * * @param securityToken security token - * @param transaction transaction to use * @param ids wikitty ids to restore * @return wikitty list */ @Override - public List<Wikitty> restore(String securityToken, WikittyTransaction transaction, List<String> ids) { + public List<Wikitty> restore(String securityToken, List<String> ids) { ArrayList<String> notInCache = new ArrayList<String>(); // linked to maintains the ordre LinkedHashMap<String, Wikitty> fromCache = @@ -278,7 +261,7 @@ } // retrieve missing object - List<Wikitty> missingInCache = ws.restore(securityToken, transaction, notInCache); + List<Wikitty> missingInCache = ws.restore(securityToken, notInCache); cache.putAllWikitty(missingInCache); @@ -320,10 +303,9 @@ */ @Override public WikittyExtension restoreExtensionLastVersion( - String securityToken, WikittyTransaction transaction, String name) { + String securityToken, String name) { // TODO poussin 20100412: perhaps use cache for extension ? - // if use cache use transaction.getCache() - return ws.restoreExtensionLastVersion(securityToken, transaction, name); + return ws.restoreExtensionLastVersion(securityToken, name); } /** @@ -372,35 +354,26 @@ * @return */ @Override - public WikittyServiceEvent store(String securityToken, WikittyTransaction transaction, + public WikittyServiceEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent result = ws.store(securityToken, transaction, - wikitties, force); + WikittyServiceEvent result = ws.store(securityToken, wikitties, force); - if (transaction != null) { - for (Wikitty w : wikitties) { - result.update(w); - } - transaction.getCache().putAllWikitty(wikitties); - } - + cache.putAllWikitty(result.getWikitties().values()); + return result; } @Override public WikittyServiceEvent storeExtension(String securityToken, - WikittyTransaction transaction, Collection<WikittyExtension> exts) { - // si on implante le cache pour cette methode, utiliser transaction.getCache() - //throw new UnsupportedOperationException("Not supported yet."); - return ws.storeExtension(securityToken, transaction, exts); + Collection<WikittyExtension> exts) { + // TODO poussin 20101029: perhaps use cache for extension ? + return ws.storeExtension(securityToken, exts); } @Override - public WikittyExtension restoreExtension(String securityToken, - WikittyTransaction transaction, String id) { - // si on implante le cache pour cette methode, utiliser transaction.getCache() - //throw new UnsupportedOperationException("Not supported yet."); - return ws.restoreExtension(securityToken, transaction, id); + public WikittyExtension restoreExtension(String securityToken, String id) { + // TODO poussin 20101029: perhaps use cache for extension ? + return ws.restoreExtension(securityToken, id); } @Override 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-10-29 02:12:48 UTC (rev 458) @@ -101,10 +101,9 @@ } @Override - public WikittyServiceEvent store(String securityToken, - WikittyTransaction transaction, Collection<Wikitty> wikitties, - boolean force) { - return delegate.store(securityToken, transaction, wikitties, force); + public WikittyServiceEvent store( + String securityToken, Collection<Wikitty> wikitties, boolean force) { + return delegate.store(securityToken, wikitties, force); } @Override @@ -120,27 +119,24 @@ @Override public WikittyServiceEvent storeExtension(String securityToken, - WikittyTransaction transaction, Collection<WikittyExtension> exts) { - return delegate.storeExtension(securityToken, transaction, exts); + Collection<WikittyExtension> exts) { + return delegate.storeExtension(securityToken, exts); } @Override - public WikittyExtension restoreExtension(String securityToken, - WikittyTransaction transaction, String id) { - return delegate.restoreExtension(securityToken, transaction, id); + public WikittyExtension restoreExtension(String securityToken, String id) { + return delegate.restoreExtension(securityToken, id); } @Override - public WikittyExtension restoreExtensionLastVersion(String securityToken, - WikittyTransaction transaction, String name) { - return delegate.restoreExtensionLastVersion(securityToken, transaction, - name); + public WikittyExtension restoreExtensionLastVersion( + String securityToken, String name) { + return delegate.restoreExtensionLastVersion(securityToken, name); } @Override - public List<Wikitty> restore(String securityToken, - WikittyTransaction transaction, List<String> id) { - return delegate.restore(securityToken, transaction, id); + public List<Wikitty> restore(String securityToken, List<String> id) { + return delegate.restore(securityToken, id); } @Override @@ -149,15 +145,14 @@ } @Override - public PagedResult<String> findAllByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { - return delegate.findAllByCriteria(securityToken, transaction, criteria); + public PagedResult<String> findAllByCriteria( + String securityToken, Criteria criteria) { + return delegate.findAllByCriteria(securityToken, criteria); } @Override - public Wikitty findByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { - return delegate.findByCriteria(securityToken, transaction, criteria); + public Wikitty findByCriteria(String securityToken, Criteria criteria) { + return delegate.findByCriteria(securityToken, criteria); } @Override Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEnhanced.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEnhanced.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEnhanced.java 2010-10-29 02:12:48 UTC (rev 458) @@ -26,38 +26,19 @@ } public WikittyServiceEvent store(String securityToken, Wikitty wikitty) { - return store(securityToken, null, Collections.singleton(wikitty), false); + return store(securityToken, Collections.singleton(wikitty), false); } public WikittyServiceEvent store(String securityToken, Collection<Wikitty> wikitties) { - return store(securityToken, null, wikitties, false); + return store(securityToken, wikitties, false); } - public WikittyServiceEvent store(String securityToken, - Collection<Wikitty> wikitties, boolean force) { - return store(securityToken, null, wikitties, force); - } - public WikittyServiceEvent storeExtension(String securityToken, WikittyExtension ext) { - return storeExtension(securityToken, null, Collections.singleton(ext)); + return storeExtension(securityToken, Collections.singleton(ext)); } - public WikittyServiceEvent storeExtension(String securityToken, - Collection<WikittyExtension> exts) { - return storeExtension(securityToken, null, exts); - } - - public WikittyExtension restoreExtension(String securityToken, String id) { - return restoreExtension(securityToken, null, id); - } - - public WikittyExtension restoreExtensionLastVersion(String securityToken, - String name) { - return restoreExtensionLastVersion(securityToken, null, name); - } - /** * * @param securityToken security token @@ -71,23 +52,10 @@ return result; } - public List<Wikitty> restore(String securityToken, List<String> id) { - return restore(securityToken, null, id); - } - public WikittyServiceEvent delete(String securityToken, String id) { return delete(securityToken, Collections.singleton(id)); } - public PagedResult<String> findAllByCriteria(String securityToken, - Criteria criteria) { - return findAllByCriteria(securityToken, null, criteria); - } - - public Wikitty findByCriteria(String securityToken, Criteria criteria) { - return findByCriteria(securityToken, null, criteria); - } - /** * Conveniant static method usefull in other WikittyService implementation * where we don't wan't instanciate WikittyServiceEnhanced @@ -100,8 +68,8 @@ */ static public Wikitty restore(WikittyService ws, String securityToken, String id) { Wikitty result = null; - List<Wikitty> resultList = ws.restore(securityToken, null, - Collections.singletonList(id)); + List<Wikitty> resultList = + ws.restore(securityToken, Collections.singletonList(id)); if (resultList != null && resultList.size() > 0) { result = resultList.get(0); } 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-29 02:12:48 UTC (rev 458) @@ -184,6 +184,12 @@ // } @Override public WikittyServiceEvent store(String securityToken, + Collection<Wikitty> wikitties, boolean force) { + WikittyServiceEvent result = store(securityToken, null, wikitties, force); + return result; + } + + protected WikittyServiceEvent store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { if (!(wikitties instanceof Set)) { @@ -272,7 +278,13 @@ } @Override - public WikittyServiceEvent storeExtension(String securityToken, + public WikittyServiceEvent storeExtension( + String securityToken, Collection<WikittyExtension> exts) { + WikittyServiceEvent result = storeExtension(securityToken, null, exts); + return result; + } + + protected WikittyServiceEvent storeExtension(String securityToken, WikittyTransaction transaction, Collection<WikittyExtension> exts) { boolean txCreated = false; try { @@ -304,6 +316,12 @@ @Override public WikittyExtension restoreExtension( + String securityToken, String extensionId) { + WikittyExtension result = restoreExtension(securityToken, null, extensionId); + return result; + } + + protected WikittyExtension restoreExtension( String securityToken, WikittyTransaction transaction, String extensionId) { boolean txCreated = false; try { @@ -337,7 +355,13 @@ } @Override - public WikittyExtension restoreExtensionLastVersion(String securityToken, + public WikittyExtension restoreExtensionLastVersion( + String securityToken, String name) { + WikittyExtension result = restoreExtensionLastVersion(securityToken, null, name); + return result; + } + + protected WikittyExtension restoreExtensionLastVersion(String securityToken, WikittyTransaction transaction, String name) { String version = getExtensionStorage().getLastVersion(transaction, name); if(version == null) { @@ -393,7 +417,12 @@ } @Override - public List<Wikitty> restore(String securityToken, + public List<Wikitty> restore(String securityToken, List<String> ids) { + List<Wikitty> result = restore(securityToken, null, ids); + return result; + } + + protected List<Wikitty> restore(String securityToken, WikittyTransaction transaction, List<String> ids) { List<Wikitty> result = new ArrayList<Wikitty>(); @@ -446,6 +475,7 @@ // } // } + // FIXME poussin 20101029 use WikittyServiceTransaction and remove other transaction protected Wikitty upgradeData(String securityToken, WikittyTransaction transaction, Wikitty wikitty) { Wikitty result = wikitty; @@ -493,7 +523,7 @@ // Test if extension is never use in this version if(nextExtension != null) { - result = migration.migrate(this, transaction, result, + result = migration.migrate(this, result, currentExtension, nextExtension); currentExtension = nextExtension; } @@ -630,7 +660,13 @@ * return new PagedResult with Wikitty instance */ @Override - public PagedResult<String> findAllByCriteria(String securityToken, + public PagedResult<String> findAllByCriteria( + String securityToken, Criteria criteria) { + PagedResult<String> result = findAllByCriteria(securityToken, null, criteria); + return result; + } + + protected PagedResult<String> findAllByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { try { boolean txCreated = false; @@ -658,8 +694,14 @@ throw new WikittyException("Error during find", eee); } } - - public Wikitty findByCriteria(String securityToken, + + @Override + public Wikitty findByCriteria(String securityToken, Criteria criteria) { + Wikitty result = findByCriteria(securityToken, null, criteria); + return result; + } + + protected Wikitty findByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { try { boolean txCreated = false; 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-29 02:12:48 UTC (rev 458) @@ -183,10 +183,9 @@ } @Override - public WikittyServiceEvent store(String securityToken, WikittyTransaction transaction, + public WikittyServiceEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent result = ws.store(securityToken, transaction, - wikitties, force); + WikittyServiceEvent result = ws.store(securityToken, wikitties, force); // notify listeners fireEvent(result); @@ -208,32 +207,29 @@ @Override public WikittyServiceEvent storeExtension(String securityToken, - WikittyTransaction transaction, Collection<WikittyExtension> exts) { - WikittyServiceEvent result = ws.storeExtension( - securityToken, transaction, exts); + Collection<WikittyExtension> exts) { + WikittyServiceEvent result = ws.storeExtension(securityToken, exts); fireEvent(result); return result; } @Override - public WikittyExtension restoreExtension(String securityToken, - WikittyTransaction transaction, String id) { + public WikittyExtension restoreExtension(String securityToken, String id) { // no notification - return ws.restoreExtension(securityToken, transaction, id); + return ws.restoreExtension(securityToken, id); } @Override public WikittyExtension restoreExtensionLastVersion( - String securityToken, WikittyTransaction transaction, String name) { + String securityToken, String name) { // no notification - return ws.restoreExtensionLastVersion(securityToken, transaction, name); + return ws.restoreExtensionLastVersion(securityToken, name); } @Override - public List<Wikitty> restore(String securityToken, - WikittyTransaction transaction, List<String> ids) { + public List<Wikitty> restore(String securityToken, List<String> ids) { // no notification - return ws.restore(securityToken, transaction, ids); + return ws.restore(securityToken, ids); } @Override @@ -246,16 +242,15 @@ @Override public PagedResult<String> findAllByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { + Criteria criteria) { // no notification - return ws.findAllByCriteria(securityToken, transaction, criteria); + return ws.findAllByCriteria(securityToken, criteria); } @Override - public Wikitty findByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { + public Wikitty findByCriteria(String securityToken, Criteria criteria) { // no notification - return ws.findByCriteria(securityToken, transaction, criteria); + return ws.findByCriteria(securityToken, criteria); } @Override 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-29 02:12:48 UTC (rev 458) @@ -80,7 +80,7 @@ @Override public String login(String login, String password) { - Wikitty user = ws.findByCriteria(null, null, Search.query().eq( + Wikitty user = ws.findByCriteria(null, Search.query().eq( WikittyUser.FQ_FIELD_WIKITTYUSER_LOGIN, login).criteria()); if (user == null) { throw new IllegalArgumentException(String.format("no such account '%s'", login)); @@ -92,7 +92,7 @@ // force add extension to wikitty WikittyTokenHelper.addExtension(wikittyToken); WikittyTokenHelper.setUser(wikittyToken, user.getId()); - ws.store(null, null, Arrays.asList(wikittyToken), false); + ws.store(null, Arrays.asList(wikittyToken), false); log.debug(String.format("token '%s' is for login '%s'", tokenId, login)); return tokenId; @@ -180,9 +180,9 @@ @Override public WikittyServiceEvent store(String securityToken, - WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { + Collection<Wikitty> wikitties, boolean force) { Collection<Wikitty> wikittiesToStore = checkStore(securityToken, wikitties); - WikittyServiceEvent result = ws.store(securityToken, transaction, wikittiesToStore, force); + WikittyServiceEvent result = ws.store(securityToken, wikittiesToStore, force); return result; } @@ -266,9 +266,9 @@ } @Override - public List<Wikitty> restore(String securityToken, WikittyTransaction transaction, List<String> ids) { + public List<Wikitty> restore(String securityToken, List<String> ids) { String userId = getUserId(securityToken); - List<Wikitty> wikitties = ws.restore(securityToken, transaction, ids); + List<Wikitty> wikitties = ws.restore(securityToken, ids); for (Wikitty wikitty : wikitties) { if (wikitty != null) { refuseUnauthorizedRead(securityToken, userId, wikitty); @@ -380,7 +380,7 @@ public void checkDelete(String securityToken, Collection<String> ids) { String userId = getUserId(securityToken); List<String> idsAsList = new ArrayList<String>(ids); - List<Wikitty> wikitties = ws.restore(securityToken, null, idsAsList); + List<Wikitty> wikitties = ws.restore(securityToken, idsAsList); for (Wikitty wikitty : wikitties) { for (String extensionName : wikitty.getExtensionNames()) { if ( ! canWrite(securityToken, userId, extensionName, wikitty)) { @@ -469,31 +469,29 @@ @Override public WikittyServiceEvent storeExtension(String securityToken, - WikittyTransaction transaction, Collection<WikittyExtension> exts) { + Collection<WikittyExtension> exts) { checkStoreExtension(securityToken, exts); - return ws.storeExtension(securityToken, transaction, exts); + return ws.storeExtension(securityToken, exts); } @Override - public WikittyExtension restoreExtension(String securityToken, - WikittyTransaction transaction, String id) { + public WikittyExtension restoreExtension(String securityToken, String id) { // All people can read extension - return ws.restoreExtension(securityToken, transaction, id); + return ws.restoreExtension(securityToken, id); } @Override public WikittyExtension restoreExtensionLastVersion( - String securityToken, WikittyTransaction transaction, String name) { + String securityToken, String name) { // All people can read extension - return ws.restoreExtensionLastVersion(securityToken, transaction, name); + return ws.restoreExtensionLastVersion(securityToken, name); } @Override public PagedResult<String> findAllByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { + Criteria criteria) { // All people can read PagedResult that contains only id - PagedResult<String> result = ws.findAllByCriteria( - securityToken, transaction, criteria); + PagedResult<String> result = ws.findAllByCriteria(securityToken, criteria); return result; } @@ -555,8 +553,8 @@ @Override public Wikitty findByCriteria(String securityToken, - WikittyTransaction transaction, Criteria criteria) { - Wikitty wikitty = ws.findByCriteria(securityToken, transaction, criteria); + Criteria criteria) { + Wikitty wikitty = ws.findByCriteria(securityToken, criteria); String userId = getUserId(securityToken); refuseUnauthorizedRead(securityToken, userId, wikitty); return wikitty; @@ -737,7 +735,7 @@ Wikitty group; if (appAdminGroupId == null) { // 1er fois, on le recherche - group = ws.findByCriteria(securityToken, null, Search.query().eq( + group = ws.findByCriteria(securityToken, Search.query().eq( WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, WikittySecurityHelper.WIKITTY_APPADMIN_GROUP_NAME).criteria()); // group peut-etre null s'il n'existe pas Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceTransaction.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceTransaction.java 2010-10-29 02:12:48 UTC (rev 458) @@ -35,6 +35,10 @@ protected List<WikittyServiceEvent> events; + /** if autoCommit > 0 all time events numbers element equals to this + * autoCommit commit is call */ + protected int autoCommit = -1; + public WikittyServiceTransaction(ApplicationConfig config, WikittyService ws) { this.ws = ws; // create new WikittyServiceInMemory not configured with default config @@ -43,6 +47,21 @@ events = new LinkedList<WikittyServiceEvent>(); } + public void setAutoCommit(int autoCommit) { + this.autoCommit = autoCommit; + } + + public int getAutoCommit() { + return autoCommit; + } + + protected void addEvent(String securityToken, WikittyServiceEvent e) { + events.add(e); + if (autoCommit > 0 && events.size() >= autoCommit) { + commit(securityToken); + } + } + public void commit(String securityToken) { ws.replay(securityToken, events); this.tx.clear(null); @@ -88,7 +107,7 @@ @Override public WikittyServiceEvent clear(String securityToken) { WikittyServiceEvent e = tx.clear(securityToken); - events.add(e); + addEvent(securityToken, e); return e; } @@ -122,9 +141,10 @@ } @Override - public WikittyServiceEvent store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent e = tx.store(securityToken, transaction, wikitties, force); - events.add(e); + public WikittyServiceEvent store( + String securityToken, Collection<Wikitty> wikitties, boolean force) { + WikittyServiceEvent e = tx.store(securityToken, wikitties, force); + addEvent(securityToken, e); return e; } @@ -151,34 +171,38 @@ } @Override - public WikittyServiceEvent storeExtension(String securityToken, WikittyTransaction transaction, Collection<WikittyExtension> exts) { - WikittyServiceEvent e = tx.storeExtension(securityToken, transaction, exts); - events.add(e); + public WikittyServiceEvent storeExtension( + String securityToken, Collection<WikittyExtension> exts) { + WikittyServiceEvent e = tx.storeExtension(securityToken, exts); + addEvent(securityToken, e); return e; } @Override - public WikittyExtension restoreExtension(String securityToken, WikittyTransaction transaction, String extensionId) { - WikittyExtension result = tx.restoreExtension(securityToken, transaction, extensionId); + public WikittyExtension restoreExtension( + String securityToken, String extensionId) { + WikittyExtension result = tx.restoreExtension(securityToken, extensionId); if (result == null) { - result = ws.restoreExtension(securityToken, transaction, extensionId); + result = ws.restoreExtension(securityToken, extensionId); } return result; } @Override - public WikittyExtension restoreExtensionLastVersion(String securityToken, WikittyTransaction transaction, String name) { - WikittyExtension result = tx.restoreExtensionLastVersion(securityToken, transaction, name); + public WikittyExtension restoreExtensionLastVersion( + String securityToken, String name) { + WikittyExtension result = + tx.restoreExtensionLastVersion(securityToken, name); if (result == null) { - result = ws.restoreExtension(securityToken, transaction, name); + result = ws.restoreExtensionLastVersion(securityToken, name); } return result; } @Override - public List<Wikitty> restore(String securityToken, WikittyTransaction transaction, List<String> ids) { - List<Wikitty> resultWS = ws.restore(securityToken, transaction, ids); - List<Wikitty> resultTx = tx.restore(securityToken, transaction, ids); + public List<Wikitty> restore(String securityToken, List<String> ids) { + List<Wikitty> resultWS = ws.restore(securityToken, ids); + List<Wikitty> resultTx = tx.restore(securityToken, ids); Wikitty[] result = resultWS.toArray(new Wikitty[resultWS.size()]); int i = 0; for (Wikitty w : resultTx) { @@ -201,18 +225,19 @@ public WikittyServiceEvent delete(String securityToken, Collection<String> ids) { // pour que tout fonctionne bien, il faut que les objets supprimer soit // dans la tx, car il faut avoir une vrai trace de cette suppression dans la tx - List<Wikitty> wikitties = ws.restore(securityToken, null, new ArrayList<String>(ids)); - tx.store(securityToken, null, wikitties, true); + List<Wikitty> wikitties = ws.restore(securityToken, new ArrayList<String>(ids)); + tx.store(securityToken, wikitties, true); WikittyServiceEvent e = tx.delete(securityToken, ids); - events.add(e); + addEvent(securityToken, e); return e; } @Override - public PagedResult<String> findAllByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { - PagedResult<String> resultTx = tx.findAllByCriteria(securityToken, transaction, criteria); - PagedResult<String> resultWs = ws.findAllByCriteria(securityToken, transaction, criteria); + public PagedResult<String> findAllByCriteria( + String securityToken, Criteria criteria) { + PagedResult<String> resultTx = tx.findAllByCriteria(securityToken, criteria); + PagedResult<String> resultWs = ws.findAllByCriteria(securityToken, criteria); // Il faut fusionner les deux resultats // - ne pas avoir de doublon @@ -237,14 +262,14 @@ } @Override - public Wikitty findByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { + public Wikitty findByCriteria(String securityToken, Criteria criteria) { Wikitty result = null; - PagedResult<String> ids = findAllByCriteria(securityToken, transaction, criteria); + PagedResult<String> ids = findAllByCriteria(securityToken, criteria); List<String> results = ids.getAll(); if (results.size() > 0) { String id = results.get(0); List<Wikitty> wikitties = restore( - securityToken, transaction, Collections.singletonList(id)); + securityToken, Collections.singletonList(id)); result = wikitties.get(0); } return result; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-10-29 02:12:48 UTC (rev 458) @@ -744,7 +744,7 @@ if (WikittyUtil.versionGreaterThan(newVersion, oldVersion)) { wikittyService.storeExtension( - securityToken, null, Arrays.asList(ext)); + securityToken, Arrays.asList(ext)); upgradeData = true; } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-10-29 02:12:48 UTC (rev 458) @@ -32,7 +32,6 @@ import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyImportExportService.FORMAT; import org.nuiton.wikitty.search.Element; @@ -42,7 +41,6 @@ static private Log log = LogFactory.getLog(ImportTask.class); protected WikittyService ws; - protected WikittyTransaction transaction; protected FORMAT format; protected Criteria criteria; protected Writer writer; @@ -53,7 +51,6 @@ super(); this.securityToken = securityToken; this.ws = ws; - this.transaction = new WikittyTransaction(); this.format = format; this.criteria = criteria; this.writer = writer; @@ -62,31 +59,28 @@ @Override public void run() { try { - transaction.begin(); // use a facet to get only extension used in export // used for CSV export criteria.addFacetField(Element.ELT_EXTENSION); PagedResult<String> pageResultId = ws.findAllByCriteria( - securityToken, transaction, criteria); + securityToken, criteria); long time = 0; if (log.isInfoEnabled()) { time = System.currentTimeMillis(); log.info("Export started"); } // get Wikitty from Id - PagedResult<Wikitty> pageResult = pageResultId.cast(securityToken, ws, transaction); + PagedResult<Wikitty> pageResult = pageResultId.cast(securityToken, ws); ImportExportMethod exporter = format.ieporter(); - exporter.exportWriter(securityToken, writer, ws, transaction, pageResult); + exporter.exportWriter(securityToken, writer, ws, pageResult); if (log.isInfoEnabled()) { time = System.currentTimeMillis() - time; log.info("Export in (ms)" + time); } - transaction.commit(); } catch (Exception eee) { - transaction.rollback(); throw new WikittyException("Error during export task", eee); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-10-29 02:12:48 UTC (rev 458) @@ -79,8 +79,7 @@ @Override public void importReader(String securityToken, Reader reader, - WikittyService ws, WikittyTransaction transaction, - WikittyBatchUpdate batchUpdate) throws Exception { + WikittyService ws) throws Exception { // get index of wikitty.id field int wikittyIdIndex = -1; @@ -135,7 +134,8 @@ String[] extensions = extensionList.split(","); for (String extension : extensions) { String extName = extension.trim(); - addMissingExtension(securityToken, ws, transaction, currentWikitty, extName); + addMissingExtension( + securityToken, ws, currentWikitty, extName); } } } @@ -156,10 +156,10 @@ if (StringUtils.isNotEmpty(value)) { // extension must exists on wikitty to set a field value - addMissingExtension(securityToken, ws, transaction, currentWikitty, extName); + addMissingExtension(securityToken, ws, currentWikitty, extName); // convert link values (if necessary) - value = convertLinkValues(securityToken, transaction, ws, value); + value = convertLinkValues(securityToken, ws, value); // add value to correct field FieldType fieldType = currentWikitty.getFieldType(extName + "." + fieldName); @@ -176,7 +176,8 @@ if (fieldType.getType().equals(TYPE.WIKITTY)) { // restore works (database) but solr criteria won't - List<Wikitty> wikitties = ws.restore(securityToken, transaction, Collections.singletonList(multiplesValue)); + List<Wikitty> wikitties = ws.restore(securityToken, + Collections.singletonList(multiplesValue)); if ( wikitties != null && wikitties.size() == 1 && wikitties.get(0) != null) { currentWikitty.addToField(extName, fieldName, multiplesValue); } @@ -190,7 +191,8 @@ if (fieldType.getType().equals(TYPE.WIKITTY)) { // restore works (database) but solr criteria won't - List<Wikitty> wikitties = ws.restore(securityToken, transaction, Collections.singletonList(value)); + List<Wikitty> wikitties = ws.restore(securityToken, + Collections.singletonList(value)); if ( wikitties != null && wikitties.size() == 1 && wikitties.get(0) != null) { currentWikitty.setField(extName, fieldName, value); } @@ -203,7 +205,7 @@ } // add it into datas - batchUpdate.addWikitty(currentWikitty); + ws.store(securityToken, Collections.singleton(currentWikitty), true); } } @@ -213,11 +215,11 @@ * @throws WikittyException if the extension does not exist in base */ protected void addMissingExtension(String securityToken, WikittyService ws, - WikittyTransaction transaction, Wikitty currentWikitty, String extName) { + Wikitty currentWikitty, String extName) { // extension must exists on wikitty to set a field value if (!currentWikitty.hasExtension(extName)) { WikittyExtension extension = ws.restoreExtensionLastVersion( - securityToken, transaction, extName); + securityToken, extName); if (extension != null) { String requires = extension.getRequires(); @@ -225,7 +227,7 @@ // add required extensions BEFORE current for (String require : requires.split(",")) { String localRequire = require.trim(); - addMissingExtension(securityToken, ws, transaction, currentWikitty, localRequire); + addMissingExtension(securityToken, ws, currentWikitty, localRequire); } } @@ -243,7 +245,7 @@ * @return */ protected String convertLinkValues( - String securityToken, WikittyTransaction transaction, WikittyService ws, String value) { + String securityToken, WikittyService ws, String value) { String originalValue = value; String resultValue = ""; @@ -264,7 +266,7 @@ fValue = m.group(6); } Criteria criteria = Search.query().eq(fqField, fValue).criteria(); - Wikitty wikitty = ws.findByCriteria(securityToken, transaction, criteria); + Wikitty wikitty = ws.findByCriteria(securityToken, criteria); if (wikitty == null) { correctQueries = false; } @@ -295,8 +297,7 @@ @Override public void exportWriter(String securityToken, Writer writer, - WikittyService ws, WikittyTransaction transaction, - PagedResult<Wikitty> pagedResult) throws Exception { + WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { CSVWriter csvWriter = new CSVWriter(writer); @@ -308,7 +309,7 @@ String extName = topic.getTopicName(); WikittyExtension extension = ws.restoreExtensionLastVersion( - securityToken, transaction, extName); + securityToken, extName); String ext = WikittyExtension.computeName(extName); for (String fieldName : extension.getFieldNames()) { extensionHeader.add(ext + "." + fieldName); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-10-29 02:12:48 UTC (rev 458) @@ -55,9 +55,8 @@ * * @throws Exception */ - public void importReader(String securityToken, Reader reader, - WikittyService ws, WikittyTransaction transaction, - WikittyBatchUpdate batchUpdate) throws Exception; + public void importReader( + String securityToken, Reader reader, WikittyService ws) throws Exception; /** * Export data to writer. @@ -71,6 +70,5 @@ * @throws Exception */ public void exportWriter(String securityToken, Writer writer, - WikittyService ws, WikittyTransaction transaction, - PagedResult<Wikitty> pagedResult) throws Exception; + WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-10-29 02:12:48 UTC (rev 458) @@ -28,6 +28,7 @@ import java.io.Reader; import java.io.Writer; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.LinkedHashMap; @@ -65,8 +66,7 @@ @Override public void importReader(String securityToken, Reader reader, - WikittyService ws, WikittyTransaction transaction, - WikittyBatchUpdate batchUpdate) throws Exception { + WikittyService ws) throws Exception { XmlPullParserFactory factory = XmlPullParserFactory.newInstance( System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null); factory.setNamespaceAware(true); @@ -101,7 +101,7 @@ String extName = WikittyExtension.computeName(extId); String extVersion = WikittyExtension.computeVersion(extId); extId = WikittyExtension.computeId(extName, extVersion); - WikittyExtension e = batchUpdate.getExtension(extId); + WikittyExtension e = ws.restoreExtension(securityToken, extId); if (e == null) { throw new WikittyException("Extension not found : " + extId); } @@ -111,11 +111,11 @@ } else if (eventType == XmlPullParser.END_TAG) { String name = xpp.getName(); if ("extension".equals(name)) { - batchUpdate.addExtension(ext); + ws.storeExtension(securityToken, Collections.singleton(ext)); ext = null; } else if ("object".equals(name)) { w.setVersion(objectVersion); - batchUpdate.addWikitty(w); + ws.store(securityToken, Collections.singleton(w), true); w = null; } else if (ext != null && "field".equals(name)) { FieldType type = new FieldType(); @@ -143,8 +143,7 @@ @Override public void exportWriter(String securityToken, Writer result, - WikittyService ws, WikittyTransaction transaction, - PagedResult<Wikitty> pagedResult) throws Exception { + WikittyService ws, PagedResult<Wikitty> pagedResult) throws Exception { // keep extension already done Set<String> extDone = new HashSet<String>(); result.write("<wikengo>\n"); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-10-29 02:12:48 UTC (rev 458) @@ -29,8 +29,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyTransaction; import org.nuiton.wikitty.WikittyImportExportService.FORMAT; +import org.nuiton.wikitty.WikittyServiceTransaction; public class ImportTask implements Runnable { @@ -38,7 +38,6 @@ static private Log log = LogFactory.getLog(ImportTask.class); protected WikittyService ws; - protected WikittyTransaction transaction; protected FORMAT format; protected Reader reader; protected ImportExportMethod importerExporter; @@ -51,33 +50,30 @@ this.ws = ws; this.format = format; this.reader = reader; - this.transaction = new WikittyTransaction(); } @Override public void run() { + WikittyServiceTransaction tx = new WikittyServiceTransaction(null, ws); + // TODO poussin 20101029 rendre configurable le l'auto commit '1000' pour l'import + tx.setAutoCommit(1000); try { - transaction.begin(); - WikittyBatchUpdate batchUpdate = new WikittyBatchUpdate( - securityToken, ws, transaction); - long time = 0; if (log.isInfoEnabled()) { time = System.currentTimeMillis(); log.info("Import in (ms)" + time); } ImportExportMethod importer = format.ieporter(); - importer.importReader(securityToken, reader, ws, transaction, batchUpdate); + importer.importReader(securityToken, reader, tx); if (log.isInfoEnabled()) { time = System.currentTimeMillis() - time; log.info("Import in (ms)" + time); } - // don't forget to flush batchUpdate :) - batchUpdate.flush(); - transaction.commit(); + // don't forget to commit :) + tx.commit(securityToken); } catch (Exception eee) { - transaction.rollback(); + tx.rollback(securityToken); throw new WikittyException("Error during import task", eee); } } Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java 2010-10-29 02:12:48 UTC (rev 458) @@ -1,97 +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.importexport; - -import org.nuiton.wikitty.Wikitty; -import org.nuiton.wikitty.WikittyExtension; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyTransaction; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -/** - * Class used for import process, this class retain numberForCommit object - * before to send it to storage. - */ -public class WikittyBatchUpdate { - - // TODO poussin 20090902 do configurable numberForCommit - protected int numberForCommit = 1000; - protected int currentAdded = 0; - protected Map<String, WikittyExtension> exts = new HashMap<String, WikittyExtension>(); - protected List<Wikitty> wikitties = new LinkedList<Wikitty>(); - protected WikittyService ws; - protected WikittyTransaction transaction; - protected String securityToken; - - public WikittyBatchUpdate(String securityToken, - WikittyService ws, WikittyTransaction transaction) { - super(); - this.securityToken = securityToken; - this.ws = ws; - this.transaction = transaction; - } - - public void addExtension(WikittyExtension ext) { - exts.put(ext.getId(), ext); - inc(); - } - - public void addWikitty(Wikitty w) { - wikitties.add(w); - inc(); - } - - /** - * search extension in local extension list and if missed restore - * extension from internal WikittyService - * @param id - * @return extension - */ - public WikittyExtension getExtension(String id) { - WikittyExtension result = exts.get(id); - if (result == null) { - result = ws.restoreExtension(securityToken, transaction, id); - } - return result; - } - - public void flush() { - ws.storeExtension(securityToken, transaction, exts.values()); - ws.store(securityToken, transaction, wikitties, true); - exts.clear(); - wikitties.clear(); - currentAdded = 0; - } - - protected void inc() { - currentAdded++; - if (currentAdded >= numberForCommit) { - flush(); - } - } -} Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyServiceTransactionTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyServiceTransactionTest.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyServiceTransactionTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -40,7 +40,7 @@ // on creer un objet dans la transaction WikittyLabel labelTx = new WikittyLabelImpl(); labelTx.addLabels("coucouTx"); - tx.store(null, null, Collections.singleton(labelTx.getWikitty()), false); + tx.store(null, Collections.singleton(labelTx.getWikitty()), false); // on ne doit pas le retrouver hors de la transation Wikitty w = WikittyServiceEnhanced.restore(ws, null, labelTx.getWikittyId()); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-10-29 02:12:48 UTC (rev 458) @@ -154,7 +154,7 @@ Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST ); result.add( w ); } - ws.store(null, null, result, false); + ws.store(null, result, false); return result; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -165,7 +165,7 @@ "7ca86742-5957-4659-b12f-4915cbef9193", "77d7640c-573d-421c-a7e9-9b70bd025983" }; - List<Wikitty> wikitties = ws.restore(null, null, Arrays.asList(ids)); + List<Wikitty> wikitties = ws.restore(null, Arrays.asList(ids)); assertEquals(3, wikitties.size()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2010-10-29 02:12:48 UTC (rev 458) @@ -78,7 +78,7 @@ FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 1, 1); extension.addField("field" + i, fieldType); } - wikittyService.storeExtension(null, null, Arrays.asList(extension)); + wikittyService.storeExtension(null, Arrays.asList(extension)); Collection<Wikitty> wikitties = new ArrayList<Wikitty>(WIKITTY_SIZE); for (int i = 0; i < WIKITTY_SIZE; i++) { @@ -90,7 +90,7 @@ wikitties.add(wikitty); } long start = System.currentTimeMillis(); - wikittyService.store(null, null, wikitties, false); + wikittyService.store(null, wikitties, false); long end = System.currentTimeMillis(); log.info("[Performance" + fieldSize + "] Write times : " + ((end - start) / 1000) + "s"); @@ -98,7 +98,7 @@ start = System.currentTimeMillis(); for (int i = 0; i < WIKITTY_SIZE; i++) { int nextInt = random.nextInt(WIKITTY_SIZE); - wikittyService.restore(null, null, Arrays.asList("Performance" + fieldSize + "id" + nextInt)); + wikittyService.restore(null, Arrays.asList("Performance" + fieldSize + "id" + nextInt)); } end = System.currentTimeMillis(); log.info("[Performance" + fieldSize + "] Read times : " + ((end - start) / 1000) + "s"); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -84,13 +84,13 @@ w.setField(ext.getName(), "birth", "19/04/1968 15:12"); wikitties.add( w ); - ws.store(null, null, wikitties, false); + ws.store(null, wikitties, false); // Testing search on a date criteria Criteria criteria = Search.query() .gt("testExt.birth", "19/04/1968 15:00") .criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, null, criteria); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); List<String> found = result.getAll(); assertEquals(1, found.size()); Wikitty wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); @@ -100,7 +100,7 @@ criteria = Search.query() .ge("testExt.birth", "19/04/1968") .criteria(); - result = ws.findAllByCriteria(null, null, criteria); + result = ws.findAllByCriteria(null, criteria); found = result.getAll(); assertEquals(2, found.size()); wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); @@ -109,7 +109,7 @@ criteria = Search.query() .eq("testExt.name", "Guillaume") .criteria(); - result = ws.findAllByCriteria(null, null, criteria); + result = ws.findAllByCriteria(null, criteria); found = result.getAll(); assertEquals(1, found.size()); wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); @@ -118,7 +118,7 @@ criteria = Search.query() .eq("testExt.age", "125") .criteria(); - result = ws.findAllByCriteria(null, null, criteria); + result = ws.findAllByCriteria(null, criteria); found = result.getAll(); assertEquals(1, found.size()); wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); @@ -127,7 +127,7 @@ criteria = Search.query() .gt("testExt.age", "10") .criteria(); - result = ws.findAllByCriteria(null, null, criteria); + result = ws.findAllByCriteria(null, criteria); found = result.getAll(); assertEquals(2, found.size()); wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); @@ -139,7 +139,7 @@ exemple.addExtension(ext); exemple.setField(ext.getName(), "name", "Guillaume"); exemple.setField(ext.getName(), "age", "27"); - result = ws.findAllByCriteria(null, null, Search.query(exemple).criteria() ); + result = ws.findAllByCriteria(null, Search.query(exemple).criteria() ); found = result.getAll(); assertEquals(1, found.size()); wikittyFound = WikittyServiceEnhanced.restore(ws, null, found.get(0)); @@ -149,7 +149,7 @@ exemple.addExtension(ext); exemple.setField(ext.getName(), "name", "Guillaume"); exemple.setField(ext.getName(), "age", "125"); - result = ws.findAllByCriteria(null, null, Search.query(exemple).criteria() ); + result = ws.findAllByCriteria(null, Search.query(exemple).criteria() ); found = result.getAll(); assertEquals(0, found.size()); // log.info( found.get(0).getFieldAsString(ext.getName(), "name") ); 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -72,7 +72,7 @@ public void testStoreRestoreBasics() throws Exception { Wikitty w = createBasicWikitty(); String id = w.getId(); - ws.store(null, null, Collections.singletonList(w), false); + ws.store(null, Collections.singletonList(w), false); w = WikittyServiceEnhanced.restore(ws, null, id); assertTrue(w.hasExtension(EXTNAME)); for ( int i = 0; i < 3; i++ ) { @@ -82,11 +82,11 @@ @Test public void testExtensionMethod() throws Exception { - ws.storeExtension(null, null, Collections.singletonList(EXT_TEST)); + ws.storeExtension(null, Collections.singletonList(EXT_TEST)); List<String> extIds = ws.getAllExtensionIds(null); log.debug("extIds: " + extIds); assertEquals(1, extIds.size()); - WikittyExtension ext = ws.restoreExtension(null, null, extIds.get(0)); + WikittyExtension ext = ws.restoreExtension(null, extIds.get(0)); assertEquals(EXT_TEST.getName(), ext.getName()); assertEquals(EXT_TEST.getVersion(), ext.getVersion()); assertEquals(EXT_TEST, ext); @@ -94,12 +94,12 @@ @Test public void testExtensionRequires() throws Exception { - ws.storeExtension(null, null, Arrays.asList(EXT_REQUIRED, EXT_REQUIRES)); + ws.storeExtension(null, Arrays.asList(EXT_REQUIRED, EXT_REQUIRES)); List<String> extIds = ws.getAllExtensionsRequires(null, EXTREQUIRED); log.debug("extIds: " + extIds); assertEquals(1, extIds.size()); - WikittyExtension ext = ws.restoreExtension(null, null, extIds.get(0)); + WikittyExtension ext = ws.restoreExtension(null, extIds.get(0)); assertEquals(EXT_REQUIRES.getName(), ext.getName()); assertEquals(EXT_REQUIRES.getVersion(), ext.getVersion()); assertEquals(EXT_REQUIRES, ext); @@ -130,9 +130,9 @@ wikitties.add( w ); ids.add( w.getId() ); } - ws.store(null, null, wikitties, false); + ws.store(null, wikitties, false); - wikitties = ws.restore(null, null, ids); + wikitties = ws.restore(null, ids); int wIndex = 0; for ( String wValue : wValues ) { Wikitty w = wikitties.get(wIndex); @@ -170,7 +170,7 @@ Wikitty w = null; // should be ignored (?) try { - ws.store(null, null, Collections.singletonList(w), false); + ws.store(null, Collections.singletonList(w), false); fail("store(null) Must throw an exception !"); } catch (Exception e) { // OK ! @@ -178,7 +178,7 @@ w = new WikittyImpl(); String id = w.getId(); - ws.store(null, null, Collections.singletonList(w), false); + ws.store(null, Collections.singletonList(w), false); w = WikittyServiceEnhanced.restore(ws, null, id); assertEquals( id, w.getId() ); } @@ -192,12 +192,12 @@ "String other[0-n] unique=true notNull=true" )); - ws.storeExtension(null, null, Collections.singletonList(ext)); + ws.storeExtension(null, Collections.singletonList(ext)); Wikitty w = new WikittyImpl(); w.addExtension(ext); try { - ws.store(null, null, Collections.singletonList(w), false); + ws.store(null, Collections.singletonList(w), false); Assert.fail("not null contraint don't work on String"); } catch (WikittyException eee) { eee.printStackTrace(); @@ -206,7 +206,7 @@ w.setField("TestConstraint", "id", "toto"); try { - ws.store(null, null, Collections.singletonList(w), false); + ws.store(null, Collections.singletonList(w), false); Assert.fail("not null contraint don't work in Collection"); } catch (WikittyException eee) { eee.printStackTrace(); @@ -214,17 +214,17 @@ } w.addToField("TestConstraint", "other", "titi"); - ws.store(null, null, Collections.singletonList(w), false); + ws.store(null, Collections.singletonList(w), false); w.addToField("TestConstraint", "ext", "tata"); w.addToField("TestConstraint", "ext", "titi"); - ws.store(null, null, Collections.singletonList(w), false); + ws.store(null, Collections.singletonList(w), false); Wikitty w2 = WikittyServiceEnhanced.restore(ws, null, w.getId()); w2.addToField("TestConstraint", "ext", "tata"); // tata ne doit pas s'ajouter w2.addToField("TestConstraint", "ext", "toto"); - ws.store(null, null, Collections.singletonList(w2), false); + ws.store(null, Collections.singletonList(w2), false); Wikitty w3 = WikittyServiceEnhanced.restore(ws, null, w.getId()); HashSet set = new HashSet(Arrays.asList("tata", "titi", "toto")); @@ -256,7 +256,7 @@ Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST ); wikitties.add( w ); } - ws.store(null, null, wikitties, false); + ws.store(null, wikitties, false); // search test Wikitty w = new WikittyImpl(); @@ -264,10 +264,10 @@ w.setField(EXT_TEST.getName(), "fieldName1", "003309"); Criteria criteria = Search.query(w).criteria() .addSortDescending(EXT_TEST.getName() + ".fieldName0"); - PagedResult<String> resultFind = ws.findAllByCriteria(null, null, criteria); + PagedResult<String> resultFind = ws.findAllByCriteria(null, criteria); assertEquals(2, resultFind.size()); - List<Wikitty> wikittyFind = ws.restore(null, null, resultFind.getAll()); + List<Wikitty> wikittyFind = ws.restore(null, resultFind.getAll()); assertEquals(wikitties.subList(0, 2), wikittyFind); } @@ -301,7 +301,7 @@ Wikitty w = createWikitty( wValue, EXTNAME, EXT_TEST ); wikitties.add( w ); } - ws.store(null, null, wikitties, false); + ws.store(null, wikitties, false); // search test Wikitty w = new WikittyImpl(); @@ -311,7 +311,7 @@ .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS) .addFacetField(EXT_TEST.getName()+".fieldName0") .addFacetField(EXT_TEST.getName()+".fieldName1"); - PagedResult<String> resultFind = ws.findAllByCriteria(null, null, criteria); + PagedResult<String> resultFind = ws.findAllByCriteria(null, criteria); List<String> facetNames = new ArrayList<String>(resultFind.getFacetNames()); Collections.sort(facetNames); @@ -353,7 +353,7 @@ for( Wikitty w : wikitties ) { oldIdVersion.put(w.getId(), w.getVersion()); } - WikittyServiceEvent response = ws.store(null, null, wikitties, false); + WikittyServiceEvent response = ws.store(null, wikitties, false); for (Wikitty w : wikitties) { response.update(w); String v1 = w.getVersion(); @@ -368,7 +368,7 @@ w.addExtension(EXT_TEST); w.setField(EXT_TEST.getName(), "fieldName0", "chaiseICI"); Criteria criteria = Search.query(w).criteria(); - Wikitty resultFind = ws.findByCriteria(null, null, criteria); + Wikitty resultFind = ws.findByCriteria(null, criteria); Wikitty wikittySource = wikitties.get(1); assertEquals(w.getFieldAsString(EXT_TEST.getName(), "fieldName0"), @@ -389,7 +389,7 @@ // test to find deleted wikitty // test if solr index is coherent with database Criteria criteria1 = Search.query().eq(Element.ELT_ID, wikittySource.getId()).criteria(); - Wikitty searchedWikitty1 = ws.findByCriteria(null, null, criteria1); + Wikitty searchedWikitty1 = ws.findByCriteria(null, criteria1); Assert.assertNotNull(searchedWikitty1); ws.delete(null, Collections.singletonList(wikittySource.getId())); @@ -400,7 +400,7 @@ // test to find deleted wikitty // test if solr index is coherent with database Criteria criteria2 = Search.query().eq(Element.ELT_ID, wikittySource.getId()).criteria(); - Wikitty searchedWikitty2 = ws.findByCriteria(null, null, criteria2); + Wikitty searchedWikitty2 = ws.findByCriteria(null, criteria2); Assert.assertNull(searchedWikitty2); } @@ -464,7 +464,7 @@ // leaf.addChild( subLeaf.getWikittyId() ); } } - ws.store(null, null, wikittyNodes, false); // store treeNodes. + ws.store(null, wikittyNodes, false); // store treeNodes. Wikitty table = wikitties.get(0); Wikitty chaise = wikitties.get(1); @@ -489,8 +489,8 @@ Criteria criteria = Search.query(node.getWikitty()).criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - List<String> wikittiesId = ws.findAllByCriteria(null, null, criteria).getAll(); - List<Wikitty> wikitties = ws.restore(null, null, wikittiesId); + List<String> wikittiesId = ws.findAllByCriteria(null, criteria).getAll(); + List<Wikitty> wikitties = ws.restore(null, wikittiesId); for ( Wikitty child : wikitties ) { if (!child.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { continue; @@ -504,7 +504,7 @@ fail( "Unable to find node " + nodeName + " inside " + currentNode.getName() ); } currentNode.addAttachment(wikitty.getId()); - ws.store(null, null, Collections.singletonList(currentNode.getWikitty()), false); + ws.store(null, Collections.singletonList(currentNode.getWikitty()), false); } /** @@ -557,23 +557,23 @@ Wikitty myWikitty = new WikittyImpl(); myWikitty.addExtension(WikittyTreeNodeImpl.extensions); myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "name"); - ws.store(null, null, Collections.singletonList(myWikitty), false); + ws.store(null, Collections.singletonList(myWikitty), false); Assert.assertEquals("1.0", myWikitty.getVersion()); // store 2 : no modification - ws.store(null, null, Collections.singletonList(myWikitty), false); + ws.store(null, Collections.singletonList(myWikitty), false); Assert.assertEquals("1.0", myWikitty.getVersion()); // store 3 : modification myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "new name"); - ws.store(null, null, Collections.singletonList(myWikitty), false); + ws.store(null, Collections.singletonList(myWikitty), false); Assert.assertEquals("2.0", myWikitty.getVersion()); // store 4 : new wikitty with same wikitty id (obsolete) Wikitty myNewWikitty = new WikittyImpl(myWikitty.getId()); myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "new wikitty"); try { - ws.store(null, null, Collections.singletonList(myNewWikitty), false); + ws.store(null, Collections.singletonList(myNewWikitty), false); Assert.fail("Test must throw WikittyObsoleteException"); } catch (WikittyObsoleteException ex) { @@ -583,12 +583,12 @@ } // store 4 : same but with force (increased by force) - ws.store(null, null, Collections.singletonList(myNewWikitty), true); + ws.store(null, Collections.singletonList(myNewWikitty), true); Assert.assertEquals("3.0", myNewWikitty.getVersion()); // store 5 : fix version (not increased by force) myNewWikitty.setVersion("11.0"); - ws.store(null, null, Collections.singletonList(myNewWikitty), true); + ws.store(null, Collections.singletonList(myNewWikitty), true); Assert.assertEquals("11.0", myNewWikitty.getVersion()); } @@ -602,7 +602,7 @@ Wikitty myWikitty = new WikittyImpl(); myWikitty.addExtension(WikittyTreeNodeImpl.extensions); myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "name"); - ws.store(null, null, Collections.singletonList(myWikitty), false); + ws.store(null, Collections.singletonList(myWikitty), false); // delete ws.delete(null, Collections.singletonList(myWikitty.getId())); @@ -611,7 +611,7 @@ Assert.assertNull(restoredWikitty); // store again - ws.store(null, null, Collections.singletonList(myWikitty), false); + ws.store(null, Collections.singletonList(myWikitty), false); restoredWikitty = WikittyServiceEnhanced.restore(ws, null, myWikitty.getId()); Assert.assertNotNull(restoredWikitty); 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-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -183,12 +183,12 @@ // test extension support Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, extensionTag.getName()).criteria(); - PagedResult<String> pagedResult = ws.findAllByCriteria(null, null, criteria); + PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); Assert.assertEquals(1, pagedResult.getNumFound()); // test normal import Criteria criteria2 = Search.query().eq(extensionClient.getName() + ".name", "Toto").criteria(); - PagedResult<String> pagedResult2 = ws.findAllByCriteria(null, null, criteria2); + PagedResult<String> pagedResult2 = ws.findAllByCriteria(null, criteria2); Assert.assertEquals(1, pagedResult2.getNumFound()); // import attachment id that not exist, must be not imported Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -47,7 +47,7 @@ WikittyConfig config = new WikittyConfig(); setService(new WikittyServiceCached(config, new WikittyServiceInMemory(config))); token = service.login(null, null); - service.store(token, null, Collections.singletonList(getaWikitty()), false); + service.store(token, Collections.singletonList(getaWikitty()), false); } /** setting a field value doesn't corrupt cache */ @@ -73,7 +73,7 @@ List<String> idsToRestore = new ArrayList<String>(); idsToRestore.add(getaWikitty().getId()); - List<Wikitty> otherWikitties = service.restore(token, null, idsToRestore); + List<Wikitty> otherWikitties = service.restore(token, idsToRestore); Wikitty anotherWikitty = otherWikitties.get(0); // we set the value of a field @@ -81,7 +81,7 @@ // now let's suppose, the user cancel its modification // we don't have call store() - otherWikitties = service.restore(token, null, idsToRestore); + otherWikitties = service.restore(token, idsToRestore); anotherWikitty = otherWikitties.get(0); // the remaining wikitty should hold old value @@ -99,7 +99,7 @@ setService(new WikittyServiceCached(config, new WikittyServiceInMemory(config))); token = service.login(null, null); - service.store(token, null, Collections.singletonList(getaWikitty()), false); + service.store(token, Collections.singletonList(getaWikitty()), false); // restoring two times the same wikitty should produces two different copies Wikitty anotherWikitty = service.restore(token, getaWikitty().getId()); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -121,8 +121,8 @@ log.debug("initial wikitty rights" + authorizations); - service.storeExtension(token, null, Collections.singletonList(extension)); - service.store(token, null, Collections.singletonList(authorizations), false); + service.storeExtension(token, Collections.singletonList(extension)); + service.store(token, Collections.singletonList(authorizations), false); // Wikitty extensionAuthorisation = @@ -176,7 +176,7 @@ // now try to make a valid token invalid service.logout(readerToken); try { - service.store(readerToken, null, Collections.singletonList(getaWikitty()), false); + service.store(readerToken, Collections.singletonList(getaWikitty()), false); fail(); } catch (SecurityException e) {} } @@ -195,7 +195,7 @@ auth.addReader(readerId); log.debug("will store wikitty" + getaWikitty()); - service.store(ownerToken, null, Collections.singletonList(getaWikitty()), false); + service.store(ownerToken, Collections.singletonList(getaWikitty()), false); try { Wikitty restoredWikitty = service.restore(null, getaWikitty().getId()); @@ -210,7 +210,7 @@ public void testWriterRightOnWikitty() { getaWikitty().addExtension(WikittyAuthorisationAbstract.extensionWikittyAuthorisation); WikittyAuthorisation auth = new WikittyAuthorisationImpl(getaWikitty()); - service.store(ownerToken, null, Collections.singletonList(getaWikitty()), false); + service.store(ownerToken, Collections.singletonList(getaWikitty()), false); WikittyProxy proxy = new WikittyProxy(service); String adminId = WikittySecurityHelper.getUserWikittyId(proxy, "admin"); @@ -223,7 +223,7 @@ log.debug("will store wikitty" + getaWikitty()); try { - service.store(writerToken, null, Collections.singletonList(getaWikitty()), false); + service.store(writerToken, Collections.singletonList(getaWikitty()), false); fail("an exception should have been raised"); } catch (SecurityException e) { log.info("raised exception : " + e); @@ -241,28 +241,28 @@ public void checkReaderRightOnExtension() { try { - service.store(noRightsToken, null, Collections.singletonList(getaWikitty()), false); + service.store(noRightsToken, Collections.singletonList(getaWikitty()), false); fail("an exception should have been raised"); } catch (SecurityException e) { log.debug("creating a wikitty without rights", e); } try { - service.restoreExtension(noRightsToken, null, extension.getId()); + service.restoreExtension(noRightsToken, extension.getId()); } catch (SecurityException e) { fail("no exception should have been raised"); } try { - service.restoreExtensionLastVersion(noRightsToken, null, extension.getName()); + service.restoreExtensionLastVersion(noRightsToken, extension.getName()); } catch (SecurityException e) { fail("no exception should have been raised"); } try { - service.store(readerToken, null, Collections.singletonList(getaWikitty()), false); - service.restoreExtension(readerToken, null, extension.getId()); - service.restoreExtensionLastVersion(readerToken, null, extension.getName()); + service.store(readerToken, Collections.singletonList(getaWikitty()), false); + service.restoreExtension(readerToken, extension.getId()); + service.restoreExtensionLastVersion(readerToken, extension.getName()); } catch (SecurityException e) { fail("an exception has been raised"); } @@ -274,16 +274,16 @@ FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 0, 1); - service.restoreExtensionLastVersion(writerToken, null, extension.getName()); + service.restoreExtensionLastVersion(writerToken, extension.getName()); extension.addField("new_field", fieldType); try { - service.storeExtension(readerToken, null, Collections.singletonList(extension)); + service.storeExtension(readerToken, Collections.singletonList(extension)); fail("an exception should have been raised"); } catch (SecurityException e) {} try { - service.storeExtension(writerToken, null, Collections.singletonList(extension)); + service.storeExtension(writerToken, Collections.singletonList(extension)); } catch (SecurityException e) { fail("an exception has been raised"); } @@ -314,11 +314,11 @@ log.debug("will store rights " + extensionAuthorisation); try { - service.store(writerToken, null, Collections.singletonList(extensionAuthorisation), false); + service.store(writerToken, Collections.singletonList(extensionAuthorisation), false); fail("an exception should habe raised"); } catch (SecurityException e) {} - service.store(adminToken, null, Collections.singletonList(extensionAuthorisation), false); + service.store(adminToken, Collections.singletonList(extensionAuthorisation), false); // now, restore and check that rights are preserved extensionAuthorisation = Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-10-29 00:35:39 UTC (rev 457) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-10-29 02:12:48 UTC (rev 458) @@ -95,7 +95,7 @@ ext ); String id = w.getId(); - wikittyService.store(null, null, Collections.singletonList(w), false); + wikittyService.store(null, Collections.singletonList(w), false); ((WikittyServiceInMemory)wikittyService).saveToPersistenceFile(tempPersistFile); wikittyService = new WikittyServiceInMemory( config );