Author: bpoussin Date: 2010-11-15 18:04:29 +0100 (Mon, 15 Nov 2010) New Revision: 473 Url: http://nuiton.org/repositories/revision/wikitty/473 Log: Evolution #1046: Rename WikittyServiceListener and WikittyServiceEvent without 'Service' in name Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyListener.java Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEvent.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceListener.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCache.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorageInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-11-15 17:04:29 UTC (rev 473) @@ -32,7 +32,7 @@ import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.services.WikittyServiceEnhanced; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -131,7 +131,7 @@ public <E extends BusinessEntity> E store(E e) { Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); - WikittyServiceEvent resp = wikittyService.store(securityToken, w); + WikittyEvent resp = wikittyService.store(securityToken, w); // update object resp.update(w); return e; @@ -153,7 +153,7 @@ } // call the service with Wikitty - WikittyServiceEvent resp = wikittyService.store(securityToken, wikitties); + WikittyEvent resp = wikittyService.store(securityToken, wikitties); // update object for (Wikitty w : wikitties) { @@ -427,8 +427,8 @@ * @param treeNodeId tree node id to delete * @return {@true} if at least one node has been deleted */ - public WikittyServiceEvent deleteTree(String treeNodeId) { - WikittyServiceEvent result = wikittyService.deleteTree(securityToken,treeNodeId); + public WikittyEvent deleteTree(String treeNodeId) { + WikittyEvent result = wikittyService.deleteTree(securityToken,treeNodeId); return result; } @@ -565,8 +565,8 @@ * @param ext extension to be persisted * @return update response */ - public WikittyServiceEvent storeExtension(WikittyExtension ext) { - WikittyServiceEvent response = + public WikittyEvent storeExtension(WikittyExtension ext) { + WikittyEvent response = wikittyService.storeExtension(securityToken, ext); return response; } @@ -577,8 +577,8 @@ * @param exts list of wikitty extension to be persisted * @return update response */ - public WikittyServiceEvent storeExtension(Collection<WikittyExtension> exts) { - WikittyServiceEvent response = + public WikittyEvent storeExtension(Collection<WikittyExtension> exts) { + WikittyEvent response = wikittyService.storeExtension(securityToken, exts); return response; } @@ -631,8 +631,8 @@ * Use with caution : It will delete ALL indexes from search engine ! * This operation should be disabled in production environment. */ - public WikittyServiceEvent clear() { - WikittyServiceEvent result = wikittyService.clear(securityToken); + public WikittyEvent clear() { + WikittyEvent result = wikittyService.clear(securityToken); return result; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-11-15 17:04:29 UTC (rev 473) @@ -29,8 +29,8 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.services.WikittyServiceEvent; -import org.nuiton.wikitty.services.WikittyServiceListener; +import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.services.WikittyListener; import java.util.Collection; import java.util.List; import java.util.Map; @@ -81,7 +81,7 @@ * * @see ServiceListenerType */ - public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type); + public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type); /** * Remove wikitty service listener. @@ -94,7 +94,7 @@ * * @see ServiceListenerType */ - public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type); + public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type); /* * security @@ -129,7 +129,7 @@ * * @param securityToken security token */ - public WikittyServiceEvent clear(String securityToken); + public WikittyEvent clear(String securityToken); /** * Verifie si l'utilisateur lie au securityToken a le droit d'ecrire @@ -198,8 +198,8 @@ * (note: perhaps this broke history, when history are implanted and * two serveur must have same history ?) */ - public WikittyServiceEvent replay( - String securityToken, List<WikittyServiceEvent> events); + public WikittyEvent replay( + String securityToken, List<WikittyEvent> events); /** * Manage Update and creation. @@ -210,7 +210,7 @@ * or force version on wikitty creation (version 0.0) * @return update response */ - public WikittyServiceEvent store( + public WikittyEvent store( String securityToken, Collection<Wikitty> wikitties, boolean force); /** @@ -238,7 +238,7 @@ * @param exts list of wikitty extension to be persisted * @return update response */ - public WikittyServiceEvent storeExtension( + public WikittyEvent storeExtension( String securityToken, Collection<WikittyExtension> exts); /** @@ -278,7 +278,7 @@ * @param securityToken security token * @param ids object's ids to remove */ - public WikittyServiceEvent delete(String securityToken, Collection<String> ids); + public WikittyEvent delete(String securityToken, Collection<String> ids); /** * @@ -322,7 +322,7 @@ * @param treeNodeId tree node id to delete * @return delete wikitty ids */ - public WikittyServiceEvent deleteTree(String securityToken, String treeNodeId); + public WikittyEvent deleteTree(String securityToken, String treeNodeId); /** * Retrieve wikitty node with count. Wikitty reference by wikittyId MUST Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/JGroupsNotifierTransporter.java 2010-11-15 17:04:29 UTC (rev 473) @@ -25,7 +25,7 @@ package org.nuiton.wikitty.services; import org.nuiton.wikitty.services.WikittyServiceNotifier; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -113,7 +113,7 @@ * @param event message to send */ @Override - public void sendMessage(WikittyServiceEvent event) throws Exception { + public void sendMessage(WikittyEvent event) throws Exception { Message msg = new Message(null, null, event); channel.send(msg); } @@ -130,8 +130,8 @@ log.info("Receive message : " + message); } - if (message instanceof WikittyServiceEvent) { - WikittyServiceEvent event = (WikittyServiceEvent)message; + if (message instanceof WikittyEvent) { + WikittyEvent event = (WikittyEvent)message; ws.processRemoteEvent(event); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCache.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCache.java 2010-11-15 17:04:29 UTC (rev 473) @@ -26,8 +26,8 @@ package org.nuiton.wikitty.services; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.services.WikittyServiceEvent; -import org.nuiton.wikitty.services.WikittyServiceListener; +import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.services.WikittyListener; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -49,7 +49,7 @@ * Last update: $Date$ * by : $Author$ */ -public class WikittyCache implements WikittyServiceListener { +public class WikittyCache implements WikittyListener { static private Log log = LogFactory.getLog(WikittyCache.class); @@ -159,45 +159,45 @@ } /* - * @see org.nuiton.wikitty.WikittyServiceListener#clearWikitty() + * @see org.nuiton.wikitty.WikittyListener#clearWikitty() */ @Override - public void clearWikitty(WikittyServiceEvent event) { + public void clearWikitty(WikittyEvent event) { clearWikitty(); } /* - * @see org.nuiton.wikitty.WikittyServiceListener#putWikitty(org.nuiton.wikitty.Wikitty[]) + * @see org.nuiton.wikitty.WikittyListener#putWikitty(org.nuiton.wikitty.Wikitty[]) */ @Override - public void putWikitty(WikittyServiceEvent event) { + public void putWikitty(WikittyEvent event) { Collection<Wikitty> wikitties = event.getWikitties().values(); putAllWikitty(wikitties); } /* - * @see org.nuiton.wikitty.WikittyServiceListener#removeWikitty(java.lang.String[]) + * @see org.nuiton.wikitty.WikittyListener#removeWikitty(java.lang.String[]) */ @Override - public void removeWikitty(WikittyServiceEvent event) { + public void removeWikitty(WikittyEvent event) { for (String id : event.getRemoveDate().keySet()) { removeWikitty(id); } } /* - * @see org.nuiton.wikitty.WikittyServiceListener#putExtension(org.nuiton.wikitty.WikittyExtension[]) + * @see org.nuiton.wikitty.WikittyListener#putExtension(org.nuiton.wikitty.WikittyExtension[]) */ @Override - public void putExtension(WikittyServiceEvent event) { + public void putExtension(WikittyEvent event) { } /* - * @see org.nuiton.wikitty.WikittyServiceListener#clearExtension() + * @see org.nuiton.wikitty.WikittyListener#clearExtension() */ @Override - public void clearExtension(WikittyServiceEvent event) { + public void clearExtension(WikittyEvent event) { } } Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java (from rev 471, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEvent.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2010-11-15 17:04:29 UTC (rev 473) @@ -0,0 +1,308 @@ +/* + * #%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.services; + +import com.thoughtworks.xstream.XStream; +import java.util.Date; +import java.util.EnumSet; +import java.util.EventObject; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; + +/** + * Wikitty service event. + * + * Contains : + * <ul> + * <li>Wikitty service as source + * <li>wikitties : wikitty added if type contains PUT_WIKITTY + * <li>ids & remove date : if type contains REMOVE_WIKITTY + * <li>extensions : extension added if type contains PUT_EXTENSION + * </ul> + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyEvent extends EventObject { + + /** serialVersionUID. */ + private static final long serialVersionUID = 9017732163643700599L; + + /** Message type (put, remove, clear...). */ + static public enum WikittyEventType { + PUT_WIKITTY(WikittyListener.PUT_WIKITTY_METHOD), + REMOVE_WIKITTY(WikittyListener.REMOVE_WIKITTY_METHOD), + CLEAR_WIKITTY(WikittyListener.CLEAR_WIKITTY_METHOD), + PUT_EXTENSION(WikittyListener.PUT_EXTENSION_METHOD), + // il est impossible actuellement de supprimer des extensions +// REMOVE_EXTENSION(WikittyListener.REMOVE_EXTENSION_METHOD), + CLEAR_EXTENSION(WikittyListener.CLEAR_EXTENSION_METHOD); + + /** le nom de la methode du listener a appeler pour ce type d'event */ + public String listenerMethodName; + WikittyEventType(String listenerMethodName) { + this.listenerMethodName = listenerMethodName; + } + } + + + /** unique event id, each event must have eventId, and event is sequence + * without hole. (ex: 0,1,2,3,4,5,6,...) */ + protected long eventId; + + /** Remote event (received from server). */ + protected boolean remote; + + /** event type, one event can have multiple type + * (ex: PUT_WIKITTY + PUT_EXTENSION */ + protected EnumSet<WikittyEventType> type; + + /** heure de creation de l'event */ + protected long time; + + /** Use by PUT_WIKITTY, all wikitties added */ + protected Map<String, Wikitty> wikitties; + + /** Use by REMOVE_WIKITTY. key: wikittyId, value: removed date */ + protected Map<String, Date> removeDate; + + /** Use by PUT_EXTENSION, all extensions added */ + protected Map<String, WikittyExtension> extensions; + + /** + * Constructor with source {@link WikittyService}. + * + * @param source wikitty service + * @param eventId unique event id + */ + public WikittyEvent(Object source) { + super(source); + this.time = System.currentTimeMillis(); + this.type = EnumSet.noneOf(WikittyEventType.class); + } + + /** + * Return time of event creation + * @return + */ + public long getTime() { + return time; + } + + /** + * To allow set transient source after deserialisation. + * + * @param source source + */ + public void setSource(Object source) { + this.source = source; + } + + public EnumSet<WikittyEventType> getType() { + return type; + } + + /** + * @param type + */ + public void addType(WikittyEventType type) { + this.type.add(type); + } + + /** + * Is event remote. + * + * @return remote event + */ + public boolean isRemote() { + return remote; + } + + /** + * Change remote event property. + * + * @param remote remote + */ + public void setRemote(boolean remote) { + this.remote = remote; + } + + public long getEventId() { + return eventId; + } + + /** + * This method must be call with right id, just before send message + * notification + * @param eventId + */ + public void setEventId(long eventId) { + this.eventId = eventId; + } + + public Map<String, Wikitty> getWikitties() { + return wikitties; + } + + public void addWikitty(Wikitty wikitty) { + if (wikitties == null) { + wikitties = new LinkedHashMap<String, Wikitty>(); + addType(WikittyEventType.PUT_WIKITTY); + } + this.wikitties.put(wikitty.getId(), wikitty); + } + + public Map<String, Date> getRemoveDate() { + return removeDate; + } + + public void addRemoveDate(String wikittyId, Date date) { + if (removeDate == null) { + removeDate = new HashMap<String, Date>(); + addType(WikittyEventType.REMOVE_WIKITTY); + } + removeDate.put(wikittyId, date); + } + + public Map<String, WikittyExtension> getExtensions() { + return extensions; + } + + public void addExtension(WikittyExtension extension) { + if (extensions == null) { + extensions = new LinkedHashMap<String, WikittyExtension>(); + addType(WikittyEventType.PUT_EXTENSION); + } + extensions.put(extension.getId(), extension); + } + + /** + * Merge this event with event passed in arguement. Merged datas are: + * <li> type + * <li> wikitties + * <li> extensions + * <li> removeDate + * + * @param e + */ + public void add(WikittyEvent e) { + getType().addAll(e.getType()); + if (e.getWikitties() != null) { + for (Map.Entry<String, Wikitty> i : e.getWikitties().entrySet()) { + addWikitty(i.getValue()); + } + } + if (e.getExtensions() != null) { + for (Map.Entry<String, WikittyExtension> i : e.getExtensions().entrySet()) { + addExtension(i.getValue()); + } + } + if (e.getRemoveDate() != null) { + for (Map.Entry<String, Date> i : e.getRemoveDate().entrySet()) { + addRemoveDate(i.getKey(), i.getValue()); + } + } + } + + /** + * Update data directly in object passed in argument. + * Actualy only version and deletion date are updated. + * <p> + * rem: during store action, no migration has done. Migration is only + * done during restore process. This implies that extension don't change + * after store. But another client, may can load wikitty with migration + * and store it, or add manualy some extension. In that case, stored wikitty + * has new/more extension that another client. + * <p> + * And internaly wikitty object is marked clean (not dirty) + * @param e + * @return wikitty passed in arguement or null, if event is CLEAR_WIKITTY + */ + public Wikitty update(Wikitty e) { + // update version + String id = e.getId(); + if (type.contains(WikittyEventType.CLEAR_WIKITTY)) { + e = null; + } else { + if (type.contains(WikittyEventType.PUT_WIKITTY)) { + Wikitty newWikitty = getWikitties().get(id); + e.replace(newWikitty); + } + if (type.contains(WikittyEventType.REMOVE_WIKITTY)) { + Date date = getRemoveDate().get(id); + e.setDeleteDate(date); + } + e.clearDirty(); + } + return e; + } + + @Override + public String toString() { + String toString = getClass().getName() + + "[source=" + source + + ", eventId=" + eventId + + ", time=" + time + + ", type=" + type + + ", remote=" + remote + + ", wikitties=" + wikitties + + ", removeDate=" + removeDate + + ", extensions=" + extensions + + "]"; + return toString; + } + + /** + * Permet de serializer en XML l'event. Pourrait etre utilise pour l'envoi + * sur un transporteur qui ne peremt pas la serialisation java + * @return + */ + public String toXML() { + XStream xstream = new XStream(); + xstream.setMode(XStream.NO_REFERENCES); + xstream.alias("event", WikittyEvent.class); + String result = xstream.toXML(this); + return result; + } + + /** + * Inverse de la methode toXML + * @param xml + * @return + */ + static public WikittyEvent fromXML(String xml) { + XStream xstream = new XStream(); + xstream.alias("event", WikittyEvent.class); + WikittyEvent result = (WikittyEvent)xstream.fromXML(xml); + return result; + } +} Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyListener.java (from rev 471, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceListener.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyListener.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyListener.java 2010-11-15 17:04:29 UTC (rev 473) @@ -0,0 +1,57 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.services; + +/** + * Permet d'ajouter des listeners sur les methodes de modification de + * WikittyService. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface WikittyListener { + + // this constant must be up to date with real method name + // this is used during fire event + final static public String PUT_WIKITTY_METHOD = "putWikitty"; + final static public String REMOVE_WIKITTY_METHOD = "removeWikitty"; + final static public String CLEAR_WIKITTY_METHOD = "clearWikitty"; + final static public String PUT_EXTENSION_METHOD = "putExtension"; + final static public String REMOVE_EXTENSION_METHOD = "removeExtension"; + final static public String CLEAR_EXTENSION_METHOD = "clearExtension"; + + public void putWikitty(WikittyEvent event); + public void removeWikitty(WikittyEvent event); + public void clearWikitty(WikittyEvent event); + + /** toto[1.0] */ + public void putExtension(WikittyEvent event); + public void clearExtension(WikittyEvent event); + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-11-15 17:04:29 UTC (rev 473) @@ -167,8 +167,8 @@ } @Override - public WikittyServiceEvent clear(String securityToken) { - WikittyServiceEvent result = ws.clear(securityToken); + public WikittyEvent clear(String securityToken) { + WikittyEvent result = ws.clear(securityToken); cache.clearWikitty(); return result; } @@ -178,8 +178,8 @@ * @param ids */ @Override - public WikittyServiceEvent delete(String securityToken, Collection<String> ids) { - WikittyServiceEvent result = ws.delete(securityToken, ids); + public WikittyEvent delete(String securityToken, Collection<String> ids) { + WikittyEvent result = ws.delete(securityToken, ids); cache.removeAllWikitty(ids); return result; } @@ -340,7 +340,7 @@ * @return */ @Override - public WikittyServiceEvent deleteTree(String securityToken, String wikittyId) { + public WikittyEvent deleteTree(String securityToken, String wikittyId) { return ws.deleteTree(securityToken, wikittyId); } @@ -353,9 +353,9 @@ * @return */ @Override - public WikittyServiceEvent store(String securityToken, + public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent result = ws.store(securityToken, wikitties, force); + WikittyEvent result = ws.store(securityToken, wikitties, force); cache.putAllWikitty(result.getWikitties().values()); @@ -363,7 +363,7 @@ } @Override - public WikittyServiceEvent storeExtension(String securityToken, + public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { // TODO poussin 20101029: perhaps use cache for extension ? return ws.storeExtension(securityToken, exts); @@ -387,12 +387,12 @@ // @Override - public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { ws.addWikittyServiceListener(listener, type); } @Override - public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { ws.removeWikittyServiceListener(listener, type); } @@ -402,7 +402,7 @@ } @Override - public WikittyServiceEvent replay(String securityToken, List<WikittyServiceEvent> events) { + public WikittyEvent replay(String securityToken, List<WikittyEvent> events) { return ws.replay(securityToken, events); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java 2010-11-15 17:04:29 UTC (rev 473) @@ -76,13 +76,13 @@ } @Override - public void addWikittyServiceListener(WikittyServiceListener listener, + public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { delegate.addWikittyServiceListener(listener, type); } @Override - public void removeWikittyServiceListener(WikittyServiceListener listener, + public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { delegate.removeWikittyServiceListener(listener, type); } @@ -98,17 +98,17 @@ } @Override - public WikittyServiceEvent clear(String securityToken) { + public WikittyEvent clear(String securityToken) { return delegate.clear(securityToken); } @Override - public WikittyServiceEvent replay(String securityToken, List<WikittyServiceEvent> events) { + public WikittyEvent replay(String securityToken, List<WikittyEvent> events) { return delegate.replay(securityToken, events); } @Override - public WikittyServiceEvent store( + public WikittyEvent store( String securityToken, Collection<Wikitty> wikitties, boolean force) { return delegate.store(securityToken, wikitties, force); } @@ -125,7 +125,7 @@ } @Override - public WikittyServiceEvent storeExtension(String securityToken, + public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { return delegate.storeExtension(securityToken, exts); } @@ -147,7 +147,7 @@ } @Override - public WikittyServiceEvent delete(String securityToken, Collection<String> ids) { + public WikittyEvent delete(String securityToken, Collection<String> ids) { return delegate.delete(securityToken, ids); } @@ -168,7 +168,7 @@ } @Override - public WikittyServiceEvent deleteTree(String securityToken, String wikittyId) { + public WikittyEvent deleteTree(String securityToken, String wikittyId) { return delegate.deleteTree(securityToken, wikittyId); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java 2010-11-15 17:04:29 UTC (rev 473) @@ -28,16 +28,16 @@ super(service); } - public WikittyServiceEvent store(String securityToken, Wikitty wikitty) { + public WikittyEvent store(String securityToken, Wikitty wikitty) { return store(securityToken, Collections.singleton(wikitty), false); } - public WikittyServiceEvent store(String securityToken, + public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties) { return store(securityToken, wikitties, false); } - public WikittyServiceEvent storeExtension(String securityToken, + public WikittyEvent storeExtension(String securityToken, WikittyExtension ext) { return storeExtension(securityToken, Collections.singleton(ext)); } @@ -55,7 +55,7 @@ return result; } - public WikittyServiceEvent delete(String securityToken, String id) { + public WikittyEvent delete(String securityToken, String id) { return delete(securityToken, Collections.singleton(id)); } Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEvent.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEvent.java 2010-11-15 17:04:29 UTC (rev 473) @@ -1,308 +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.services; - -import com.thoughtworks.xstream.XStream; -import java.util.Date; -import java.util.EnumSet; -import java.util.EventObject; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; - -/** - * Wikitty service event. - * - * Contains : - * <ul> - * <li>Wikitty service as source - * <li>wikitties : wikitty added if type contains PUT_WIKITTY - * <li>ids & remove date : if type contains REMOVE_WIKITTY - * <li>extensions : extension added if type contains PUT_EXTENSION - * </ul> - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class WikittyServiceEvent extends EventObject { - - /** serialVersionUID. */ - private static final long serialVersionUID = 9017732163643700599L; - - /** Message type (put, remove, clear...). */ - static public enum WikittyEventType { - PUT_WIKITTY(WikittyServiceListener.PUT_WIKITTY_METHOD), - REMOVE_WIKITTY(WikittyServiceListener.REMOVE_WIKITTY_METHOD), - CLEAR_WIKITTY(WikittyServiceListener.CLEAR_WIKITTY_METHOD), - PUT_EXTENSION(WikittyServiceListener.PUT_EXTENSION_METHOD), - // il est impossible actuellement de supprimer des extensions -// REMOVE_EXTENSION(WikittyServiceListener.REMOVE_EXTENSION_METHOD), - CLEAR_EXTENSION(WikittyServiceListener.CLEAR_EXTENSION_METHOD); - - /** le nom de la methode du listener a appeler pour ce type d'event */ - public String listenerMethodName; - WikittyEventType(String listenerMethodName) { - this.listenerMethodName = listenerMethodName; - } - } - - - /** unique event id, each event must have eventId, and event is sequence - * without hole. (ex: 0,1,2,3,4,5,6,...) */ - protected long eventId; - - /** Remote event (received from server). */ - protected boolean remote; - - /** event type, one event can have multiple type - * (ex: PUT_WIKITTY + PUT_EXTENSION */ - protected EnumSet<WikittyEventType> type; - - /** heure de creation de l'event */ - protected long time; - - /** Use by PUT_WIKITTY, all wikitties added */ - protected Map<String, Wikitty> wikitties; - - /** Use by REMOVE_WIKITTY. key: wikittyId, value: removed date */ - protected Map<String, Date> removeDate; - - /** Use by PUT_EXTENSION, all extensions added */ - protected Map<String, WikittyExtension> extensions; - - /** - * Constructor with source {@link WikittyService}. - * - * @param source wikitty service - * @param eventId unique event id - */ - public WikittyServiceEvent(Object source) { - super(source); - this.time = System.currentTimeMillis(); - this.type = EnumSet.noneOf(WikittyEventType.class); - } - - /** - * Return time of event creation - * @return - */ - public long getTime() { - return time; - } - - /** - * To allow set transient source after deserialisation. - * - * @param source source - */ - public void setSource(Object source) { - this.source = source; - } - - public EnumSet<WikittyEventType> getType() { - return type; - } - - /** - * @param type - */ - public void addType(WikittyEventType type) { - this.type.add(type); - } - - /** - * Is event remote. - * - * @return remote event - */ - public boolean isRemote() { - return remote; - } - - /** - * Change remote event property. - * - * @param remote remote - */ - public void setRemote(boolean remote) { - this.remote = remote; - } - - public long getEventId() { - return eventId; - } - - /** - * This method must be call with right id, just before send message - * notification - * @param eventId - */ - public void setEventId(long eventId) { - this.eventId = eventId; - } - - public Map<String, Wikitty> getWikitties() { - return wikitties; - } - - public void addWikitty(Wikitty wikitty) { - if (wikitties == null) { - wikitties = new LinkedHashMap<String, Wikitty>(); - addType(WikittyEventType.PUT_WIKITTY); - } - this.wikitties.put(wikitty.getId(), wikitty); - } - - public Map<String, Date> getRemoveDate() { - return removeDate; - } - - public void addRemoveDate(String wikittyId, Date date) { - if (removeDate == null) { - removeDate = new HashMap<String, Date>(); - addType(WikittyEventType.REMOVE_WIKITTY); - } - removeDate.put(wikittyId, date); - } - - public Map<String, WikittyExtension> getExtensions() { - return extensions; - } - - public void addExtension(WikittyExtension extension) { - if (extensions == null) { - extensions = new LinkedHashMap<String, WikittyExtension>(); - addType(WikittyEventType.PUT_EXTENSION); - } - extensions.put(extension.getId(), extension); - } - - /** - * Merge this event with event passed in arguement. Merged datas are: - * <li> type - * <li> wikitties - * <li> extensions - * <li> removeDate - * - * @param e - */ - public void add(WikittyServiceEvent e) { - getType().addAll(e.getType()); - if (e.getWikitties() != null) { - for (Map.Entry<String, Wikitty> i : e.getWikitties().entrySet()) { - addWikitty(i.getValue()); - } - } - if (e.getExtensions() != null) { - for (Map.Entry<String, WikittyExtension> i : e.getExtensions().entrySet()) { - addExtension(i.getValue()); - } - } - if (e.getRemoveDate() != null) { - for (Map.Entry<String, Date> i : e.getRemoveDate().entrySet()) { - addRemoveDate(i.getKey(), i.getValue()); - } - } - } - - /** - * Update data directly in object passed in argument. - * Actualy only version and deletion date are updated. - * <p> - * rem: during store action, no migration has done. Migration is only - * done during restore process. This implies that extension don't change - * after store. But another client, may can load wikitty with migration - * and store it, or add manualy some extension. In that case, stored wikitty - * has new/more extension that another client. - * <p> - * And internaly wikitty object is marked clean (not dirty) - * @param e - * @return wikitty passed in arguement or null, if event is CLEAR_WIKITTY - */ - public Wikitty update(Wikitty e) { - // update version - String id = e.getId(); - if (type.contains(WikittyEventType.CLEAR_WIKITTY)) { - e = null; - } else { - if (type.contains(WikittyEventType.PUT_WIKITTY)) { - Wikitty newWikitty = getWikitties().get(id); - e.replace(newWikitty); - } - if (type.contains(WikittyEventType.REMOVE_WIKITTY)) { - Date date = getRemoveDate().get(id); - e.setDeleteDate(date); - } - e.clearDirty(); - } - return e; - } - - @Override - public String toString() { - String toString = getClass().getName() - + "[source=" + source - + ", eventId=" + eventId - + ", time=" + time - + ", type=" + type - + ", remote=" + remote - + ", wikitties=" + wikitties - + ", removeDate=" + removeDate - + ", extensions=" + extensions - + "]"; - return toString; - } - - /** - * Permet de serializer en XML l'event. Pourrait etre utilise pour l'envoi - * sur un transporteur qui ne peremt pas la serialisation java - * @return - */ - public String toXML() { - XStream xstream = new XStream(); - xstream.setMode(XStream.NO_REFERENCES); - xstream.alias("event", WikittyServiceEvent.class); - String result = xstream.toXML(this); - return result; - } - - /** - * Inverse de la methode toXML - * @param xml - * @return - */ - static public WikittyServiceEvent fromXML(String xml) { - XStream xstream = new XStream(); - xstream.alias("event", WikittyServiceEvent.class); - WikittyServiceEvent result = (WikittyServiceEvent)xstream.fromXML(xml); - return result; - } -} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceImpl.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceImpl.java 2010-11-15 17:04:29 UTC (rev 473) @@ -111,18 +111,18 @@ } /* - * @see org.nuiton.wikitty.WikittyService#addWikittyServiceListener(org.nuiton.wikitty.WikittyServiceListener, org.nuiton.wikitty.WikittyService.ServiceListenerType) + * @see org.nuiton.wikitty.WikittyService#addWikittyServiceListener(org.nuiton.wikitty.WikittyListener, org.nuiton.wikitty.WikittyService.ServiceListenerType) */ @Override - public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { throw new UnsupportedOperationException("Can't add listener on " + WikittyServiceImpl.class.getName()); } /* - * @see org.nuiton.wikitty.WikittyService#removeWikittyServiceListener(org.nuiton.wikitty.WikittyServiceListener, org.nuiton.wikitty.WikittyService.ServiceListenerType) + * @see org.nuiton.wikitty.WikittyService#removeWikittyServiceListener(org.nuiton.wikitty.WikittyListener, org.nuiton.wikitty.WikittyService.ServiceListenerType) */ @Override - public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { throw new UnsupportedOperationException("Can't remove listener on " + WikittyServiceImpl.class.getName()); } @@ -198,13 +198,13 @@ // return result; // } @Override - public WikittyServiceEvent store(String securityToken, + public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent result = store(securityToken, null, wikitties, force); + WikittyEvent result = store(securityToken, null, wikitties, force); return result; } - protected WikittyServiceEvent store(String securityToken, + protected WikittyEvent store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { if (!(wikitties instanceof Set)) { @@ -229,13 +229,13 @@ } // try to commit command - WikittyServiceEvent extUpdate = + WikittyEvent extUpdate = getExtensionStorage().store(transaction, allExtensions); - WikittyServiceEvent wikUpdate = + WikittyEvent wikUpdate = getWikittyStorage().store(transaction, wikitties, force); getSearchEngin().store(transaction, wikitties); - WikittyServiceEvent result = new WikittyServiceEvent(this); + WikittyEvent result = new WikittyEvent(this); // prepare update client response result.add(extUpdate); result.add(wikUpdate); @@ -293,13 +293,13 @@ } @Override - public WikittyServiceEvent storeExtension( + public WikittyEvent storeExtension( String securityToken, Collection<WikittyExtension> exts) { - WikittyServiceEvent result = storeExtension(securityToken, null, exts); + WikittyEvent result = storeExtension(securityToken, null, exts); return result; } - protected WikittyServiceEvent storeExtension(String securityToken, + protected WikittyEvent storeExtension(String securityToken, WikittyTransaction transaction, Collection<WikittyExtension> exts) { boolean txCreated = false; try { @@ -309,7 +309,7 @@ transaction.begin(); } - WikittyServiceEvent result = + WikittyEvent result = getExtensionStorage().store(transaction, exts); if (txCreated) { @@ -551,7 +551,7 @@ return result; } - protected WikittyServiceEvent delete(String securityToken, WikittyTransaction transaction, + protected WikittyEvent delete(String securityToken, WikittyTransaction transaction, Collection<String> ids) throws WikittyException { // work only on valid id Collection<Wikitty> storedWikitties = new LinkedHashSet<Wikitty>(); @@ -604,14 +604,14 @@ } } - WikittyServiceEvent eventDelete = + WikittyEvent eventDelete = getWikittyStorage().delete(transaction, idSet); getSearchEngin().delete(transaction, idSet); - WikittyServiceEvent eventStore = + WikittyEvent eventStore = store(securityToken, transaction, storedWikitties, false); - WikittyServiceEvent result = new WikittyServiceEvent(this); + WikittyEvent result = new WikittyEvent(this); result.add(eventDelete); result.add(eventStore); @@ -619,12 +619,12 @@ } @Override - public WikittyServiceEvent delete(String securityToken, Collection<String> ids){ + public WikittyEvent delete(String securityToken, Collection<String> ids){ WikittyTransaction transaction = new WikittyTransaction(); try { transaction.begin(); - WikittyServiceEvent result = delete(securityToken, transaction, ids); + WikittyEvent result = delete(securityToken, transaction, ids); transaction.commit(); return result; @@ -639,13 +639,13 @@ * This operation should be disabled in production environment. */ @Override - public WikittyServiceEvent clear(String securityToken) { + public WikittyEvent clear(String securityToken) { WikittyTransaction transaction = new WikittyTransaction(); try { transaction.begin(); - WikittyServiceEvent result = clear(securityToken, transaction); + WikittyEvent result = clear(securityToken, transaction); transaction.commit(); return result; @@ -659,12 +659,12 @@ * Use with caution : It will delete ALL indexes from search engine ! * This operation should be disabled in production environment. */ - protected WikittyServiceEvent clear(String securityToken, WikittyTransaction tx) { + protected WikittyEvent clear(String securityToken, WikittyTransaction tx) { getSearchEngin().clear(tx); - WikittyServiceEvent eventWik = getWikittyStorage().clear(tx); - WikittyServiceEvent eventExt = getExtensionStorage().clear(tx); + WikittyEvent eventWik = getWikittyStorage().clear(tx); + WikittyEvent eventExt = getExtensionStorage().clear(tx); - WikittyServiceEvent result = new WikittyServiceEvent(this); + WikittyEvent result = new WikittyEvent(this); result.add(eventWik); result.add(eventExt); return result; @@ -800,12 +800,12 @@ } @Override - public WikittyServiceEvent deleteTree(String securityToken, String thesaurusId) { + public WikittyEvent deleteTree(String securityToken, String thesaurusId) { WikittyTransaction transaction = new WikittyTransaction(); try { transaction.begin(); - WikittyServiceEvent result = deleteTree(securityToken, transaction, thesaurusId); + WikittyEvent result = deleteTree(securityToken, transaction, thesaurusId); transaction.commit(); return result; @@ -823,9 +823,9 @@ * @param treeNodeId thesaurusId to delete * @return all id of delete nodes */ - protected WikittyServiceEvent deleteTree(String securityToken, WikittyTransaction transaction, String treeNodeId) { + protected WikittyEvent deleteTree(String securityToken, WikittyTransaction transaction, String treeNodeId) { List<String> allTreeNodeId = getRecursiveTreeNodeId(securityToken, transaction, treeNodeId); - WikittyServiceEvent result = delete(securityToken, transaction, allTreeNodeId); + WikittyEvent result = delete(securityToken, transaction, allTreeNodeId); return result; } @@ -993,7 +993,7 @@ * @return */ @Override - public WikittyServiceEvent replay(String securityToken, List<WikittyServiceEvent> events) { + public WikittyEvent replay(String securityToken, List<WikittyEvent> events) { // indique qu'il faut vider la base avant de faire les ajouts boolean mustClear = false; @@ -1008,30 +1008,30 @@ // recherche un event avec un clear pour ne pas jouer des events inutiles // recherche un store + delete du meme wikitty // recherche le dernier store du wikitty - for (WikittyServiceEvent e : events) { + for (WikittyEvent e : events) { // check clear must be the first, if event have clear and other type // clear is all time play first if (e.getType().contains( - WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY) + WikittyEvent.WikittyEventType.CLEAR_WIKITTY) || e.getType().contains( - WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION)) { + WikittyEvent.WikittyEventType.CLEAR_EXTENSION)) { mustClear = true; toAddWikitty.clear(); toRemoveWikitty.clear(); toAddExt.clear(); } - if (e.getType().contains(WikittyServiceEvent.WikittyEventType.PUT_WIKITTY)) { + if (e.getType().contains(WikittyEvent.WikittyEventType.PUT_WIKITTY)) { for (Wikitty w : e.getWikitties().values()) { toAddWikitty.put(w.getId(), w); } } - if (e.getType().contains(WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY)) { + if (e.getType().contains(WikittyEvent.WikittyEventType.REMOVE_WIKITTY)) { for (Map.Entry<String, Date> entry : e.getRemoveDate().entrySet()) { toAddWikitty.remove(entry.getKey()); toRemoveWikitty.put(entry.getKey(), entry.getValue()); } } - if (e.getType().contains(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION)) { + if (e.getType().contains(WikittyEvent.WikittyEventType.PUT_EXTENSION)) { for (WikittyExtension ext : e.getExtensions().values()) { toAddExt.add(ext); } @@ -1044,20 +1044,20 @@ // Actuellement il n'y a pas moyen de supprimer une extension (par surete) // donc on ne fait rien avec toRemoveExt - WikittyServiceEvent result = new WikittyServiceEvent(this); + WikittyEvent result = new WikittyEvent(this); if (mustClear) { - WikittyServiceEvent eventClear = clear(securityToken, tx); + WikittyEvent eventClear = clear(securityToken, tx); result.add(eventClear); } - WikittyServiceEvent eventStoreExtension = + WikittyEvent eventStoreExtension = storeExtension(securityToken, tx, toAddExt); result.add(eventStoreExtension); - WikittyServiceEvent eventStoreWikitty = + WikittyEvent eventStoreWikitty = store(securityToken, tx, toAddWikitty.values(), false); result.add(eventStoreWikitty); - WikittyServiceEvent eventDeleteWikitty = + WikittyEvent eventDeleteWikitty = delete(securityToken, tx, toRemoveWikitty.keySet()); result.add(eventDeleteWikitty); Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceListener.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceListener.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceListener.java 2010-11-15 17:04:29 UTC (rev 473) @@ -1,57 +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.services; - -/** - * Permet d'ajouter des listeners sur les methodes de modification de - * WikittyService. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public interface WikittyServiceListener { - - // this constant must be up to date with real method name - // this is used during fire event - final static public String PUT_WIKITTY_METHOD = "putWikitty"; - final static public String REMOVE_WIKITTY_METHOD = "removeWikitty"; - final static public String CLEAR_WIKITTY_METHOD = "clearWikitty"; - final static public String PUT_EXTENSION_METHOD = "putExtension"; - final static public String REMOVE_EXTENSION_METHOD = "removeExtension"; - final static public String CLEAR_EXTENSION_METHOD = "clearExtension"; - - public void putWikitty(WikittyServiceEvent event); - public void removeWikitty(WikittyServiceEvent event); - public void clearWikitty(WikittyServiceEvent event); - - /** toto[1.0] */ - public void putExtension(WikittyServiceEvent event); - public void clearExtension(WikittyServiceEvent event); - -} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceNotifier.java 2010-11-15 17:04:29 UTC (rev 473) @@ -70,21 +70,21 @@ protected WikittyService ws; /** Wikitty service listener (all event). */ - protected ListenerSet<WikittyServiceListener> allWikittyServiceListeners; + protected ListenerSet<WikittyListener> allWikittyServiceListeners; /** Wikitty service listener (only for local event). */ - protected ListenerSet<WikittyServiceListener> localWikittyServiceListeners; + protected ListenerSet<WikittyListener> localWikittyServiceListeners; /** Wikitty service listener (only for remote event). */ - protected ListenerSet<WikittyServiceListener> remoteWikittyServiceListeners; + protected ListenerSet<WikittyListener> remoteWikittyServiceListeners; /** notifier */ - protected WikittyServiceListener notifier; + protected WikittyListener notifier; /** * Tous les events en attentent d'etre envoyer aux listeners */ - protected LinkedBlockingQueue<WikittyServiceEvent> eventToSend; + protected LinkedBlockingQueue<WikittyEvent> eventToSend; /** thread utilise pour evoyer les events */ protected EventThread eventThread; @@ -100,11 +100,11 @@ this.ws = ws; // listeners - allWikittyServiceListeners = new ListenerSet<WikittyServiceListener>(); - localWikittyServiceListeners = new ListenerSet<WikittyServiceListener>(); - remoteWikittyServiceListeners = new ListenerSet<WikittyServiceListener>(); + allWikittyServiceListeners = new ListenerSet<WikittyListener>(); + localWikittyServiceListeners = new ListenerSet<WikittyListener>(); + remoteWikittyServiceListeners = new ListenerSet<WikittyListener>(); - eventToSend = new LinkedBlockingQueue<WikittyServiceEvent>(); + eventToSend = new LinkedBlockingQueue<WikittyEvent>(); eventThread = new EventThread(eventToSend, allWikittyServiceListeners, localWikittyServiceListeners, @@ -117,7 +117,7 @@ } @Override - public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { // not delegated switch (type) { case ALL : @@ -139,7 +139,7 @@ } @Override - public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { // not delegated switch (type) { case ALL : @@ -186,16 +186,16 @@ } @Override - public WikittyServiceEvent clear(String securityToken) { - WikittyServiceEvent result = ws.clear(securityToken); + public WikittyEvent clear(String securityToken) { + WikittyEvent result = ws.clear(securityToken); fireEvent(result); return result; } @Override - public WikittyServiceEvent store(String securityToken, + public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent result = ws.store(securityToken, wikitties, force); + WikittyEvent result = ws.store(securityToken, wikitties, force); // notify listeners fireEvent(result); @@ -216,9 +216,9 @@ } @Override - public WikittyServiceEvent storeExtension(String securityToken, + public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { - WikittyServiceEvent result = ws.storeExtension(securityToken, exts); + WikittyEvent result = ws.storeExtension(securityToken, exts); fireEvent(result); return result; } @@ -243,8 +243,8 @@ } @Override - public WikittyServiceEvent delete(String securityToken, Collection<String> ids) { - WikittyServiceEvent result = ws.delete(securityToken, ids); + public WikittyEvent delete(String securityToken, Collection<String> ids) { + WikittyEvent result = ws.delete(securityToken, ids); // notify listeners fireEvent(result); return result; @@ -270,8 +270,8 @@ } @Override - public WikittyServiceEvent deleteTree(String securityToken, String wikittyId) { - WikittyServiceEvent result = ws.deleteTree(securityToken, wikittyId); + public WikittyEvent deleteTree(String securityToken, String wikittyId) { + WikittyEvent result = ws.deleteTree(securityToken, wikittyId); fireEvent(result); return result; } @@ -306,11 +306,11 @@ /** * Fire event to all registred listener. * - * Take care about {@link WikittyServiceEvent#isRemote()} for fire. + * Take care about {@link WikittyEvent#isRemote()} for fire. * * @param event event to fire */ - protected void fireEvent(final WikittyServiceEvent event) { + protected void fireEvent(final WikittyEvent event) { // ajout d'un thread, car si les listener doit // ouvrir une transaction WikittyTransaction // alors que celui qui lance l'event en a une ouverte @@ -335,7 +335,7 @@ * fire event passed in argument. Before fire, change source to current * WikittyServiceNotifier and set remote event to true. */ - public void processRemoteEvent(WikittyServiceEvent event) { + public void processRemoteEvent(WikittyEvent event) { //source is transient, add it here : event.setSource(this); event.setRemote(true); // received event became remote @@ -358,8 +358,8 @@ } @Override - public WikittyServiceEvent replay(String securityToken, List<WikittyServiceEvent> events) { - WikittyServiceEvent result = ws.replay(securityToken, events); + public WikittyEvent replay(String securityToken, List<WikittyEvent> events) { + WikittyEvent result = ws.replay(securityToken, events); // notify listeners fireEvent(result); return result; @@ -390,24 +390,24 @@ /** * reference vers la collection qui contient les events a envoyer */ - protected LinkedBlockingQueue<WikittyServiceEvent> eventToSend; + protected LinkedBlockingQueue<WikittyEvent> eventToSend; /** Wikitty service listener (all event). */ - protected ListenerSet<WikittyServiceListener> allWikittyServiceListeners; + protected ListenerSet<WikittyListener> allWikittyServiceListeners; /** Wikitty service listener (only for local event). */ - protected ListenerSet<WikittyServiceListener> localWikittyServiceListeners; + protected ListenerSet<WikittyListener> localWikittyServiceListeners; /** Wikitty service listener (only for remote event). */ - protected ListenerSet<WikittyServiceListener> remoteWikittyServiceListeners; + protected ListenerSet<WikittyListener> remoteWikittyServiceListeners; /** heure du dernier event envoye */ protected long lastEventTime = 0; - public EventThread(LinkedBlockingQueue<WikittyServiceEvent> eventToSend, - ListenerSet<WikittyServiceListener> allWikittyServiceListeners, - ListenerSet<WikittyServiceListener> localWikittyServiceListeners, - ListenerSet<WikittyServiceListener> remoteWikittyServiceListeners) { + public EventThread(LinkedBlockingQueue<WikittyEvent> eventToSend, + ListenerSet<WikittyListener> allWikittyServiceListeners, + ListenerSet<WikittyListener> localWikittyServiceListeners, + ListenerSet<WikittyListener> remoteWikittyServiceListeners) { super("wikitty-event-thread"); this.eventToSend = eventToSend; this.allWikittyServiceListeners = allWikittyServiceListeners; @@ -472,13 +472,13 @@ protected void processEventQueue() { try { - WikittyServiceEvent event; + WikittyEvent event; // on attend pas indefiniment un event, car il faut verifier // aussi que personne n'a arrete le thread while (null != (event = eventToSend.poll(5, TimeUnit.SECONDS))) { try { synchronized (allWikittyServiceListeners) { - for(WikittyServiceEvent.WikittyEventType type : event.getType()) { + for(WikittyEvent.WikittyEventType type : event.getType()) { allWikittyServiceListeners.fire( type.listenerMethodName, event); } @@ -489,14 +489,14 @@ try { if (event.isRemote()) { synchronized (remoteWikittyServiceListeners) { - for (WikittyServiceEvent.WikittyEventType type : event.getType()) { + for (WikittyEvent.WikittyEventType type : event.getType()) { remoteWikittyServiceListeners.fire( type.listenerMethodName, event); } } } else { synchronized (localWikittyServiceListeners) { - for (WikittyServiceEvent.WikittyEventType type : event.getType()) { + for (WikittyEvent.WikittyEventType type : event.getType()) { localWikittyServiceListeners.fire( type.listenerMethodName, event); } @@ -563,7 +563,7 @@ * * @param event message to send */ - public void sendMessage(WikittyServiceEvent event) throws Exception; + public void sendMessage(WikittyEvent event) throws Exception; } /** @@ -571,7 +571,7 @@ * only if wikitty.notifier.transporter.class configuration is found and * wikitty.service.event.propagateEvent is true */ - static public class RemoteNotifier implements WikittyServiceListener { + static public class RemoteNotifier implements WikittyListener { /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(RemoteNotifier.class); @@ -619,7 +619,7 @@ * * @param event message to send */ - protected void sendMessage(WikittyServiceEvent event) { + protected void sendMessage(WikittyEvent event) { try { if (log.isDebugEnabled()) { log.debug("Try to send message : " + event); @@ -638,10 +638,10 @@ } /* - * @see org.nuiton.wikitty.WikittyServiceListener#putWikitty(org.nuiton.wikitty.Wikitty[]) + * @see org.nuiton.wikitty.WikittyListener#putWikitty(org.nuiton.wikitty.Wikitty[]) */ @Override - public void putWikitty(WikittyServiceEvent event) { + public void putWikitty(WikittyEvent event) { if (propagateEvent) { sendMessage(event); } else { @@ -652,10 +652,10 @@ } /* - * @see org.nuiton.wikitty.WikittyServiceListener#removeWikitty(java.lang.String[]) + * @see org.nuiton.wikitty.WikittyListener#removeWikitty(java.lang.String[]) */ @Override - public void removeWikitty(WikittyServiceEvent event) { + public void removeWikitty(WikittyEvent event) { if (propagateEvent) { sendMessage(event); } else { @@ -666,10 +666,10 @@ } /* - * @see org.nuiton.wikitty.WikittyServiceListener#clearWikitty() + * @see org.nuiton.wikitty.WikittyListener#clearWikitty() */ @Override - public void clearWikitty(WikittyServiceEvent event) { + public void clearWikitty(WikittyEvent event) { if (propagateEvent) { sendMessage(event); } else { @@ -680,10 +680,10 @@ } /* - * @see org.nuiton.wikitty.WikittyServiceListener#putExtension(org.nuiton.wikitty.WikittyExtension[]) + * @see org.nuiton.wikitty.WikittyListener#putExtension(org.nuiton.wikitty.WikittyExtension[]) */ @Override - public void putExtension(WikittyServiceEvent event) { + public void putExtension(WikittyEvent event) { if (propagateEvent) { sendMessage(event); } else { @@ -694,10 +694,10 @@ } /* - * @see org.nuiton.wikitty.WikittyServiceListener#clearExtension() + * @see org.nuiton.wikitty.WikittyListener#clearExtension() */ @Override - public void clearExtension(WikittyServiceEvent event) { + public void clearExtension(WikittyEvent event) { if (propagateEvent) { sendMessage(event); } else { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2010-11-15 17:04:29 UTC (rev 473) @@ -86,12 +86,12 @@ } @Override - public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { ws.addWikittyServiceListener(listener, type); } @Override - public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { ws.addWikittyServiceListener(listener, type); } @@ -130,11 +130,11 @@ } @Override - public WikittyServiceEvent clear(String securityToken) { + public WikittyEvent clear(String securityToken) { String userId = getUserId(securityToken); if (isAppAdmin(securityToken, userId)) { // seul les AppAdmin on le droit a cette method - WikittyServiceEvent result = ws.clear(securityToken); + WikittyEvent result = ws.clear(securityToken); return result; } else { throw new SecurityException(_("user %s can't clear data", userId)); @@ -142,13 +142,13 @@ } @Override - public WikittyServiceEvent replay(String securityToken, List<WikittyServiceEvent> events) { + public WikittyEvent replay(String securityToken, List<WikittyEvent> events) { String userId = getUserId(securityToken); - for (WikittyServiceEvent e : events) { + for (WikittyEvent e : events) { if (e.getType().contains( - WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY) + WikittyEvent.WikittyEventType.CLEAR_WIKITTY) || e.getType().contains( - WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION)) { + WikittyEvent.WikittyEventType.CLEAR_EXTENSION)) { if (isAppAdmin(securityToken, userId)) { // seul les AppAdmin on le droit a cette method // les AppAdmin on meme le droit de tout faire, donc on @@ -158,17 +158,17 @@ throw new SecurityException(_("user %s can't clear data", userId)); } } - if (e.getType().contains(WikittyServiceEvent.WikittyEventType.PUT_WIKITTY)) { + if (e.getType().contains(WikittyEvent.WikittyEventType.PUT_WIKITTY)) { checkStore(securityToken, e.getWikitties().values()); } - if (e.getType().contains(WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY)) { + if (e.getType().contains(WikittyEvent.WikittyEventType.REMOVE_WIKITTY)) { checkDelete(securityToken, e.getRemoveDate().keySet()); } - if (e.getType().contains(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION)) { + if (e.getType().contains(WikittyEvent.WikittyEventType.PUT_EXTENSION)) { checkStoreExtension(securityToken, e.getExtensions().values()); } } - WikittyServiceEvent result = ws.replay(securityToken, events); + WikittyEvent result = ws.replay(securityToken, events); return result; } @@ -196,10 +196,10 @@ } @Override - public WikittyServiceEvent store(String securityToken, + public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties, boolean force) { Collection<Wikitty> wikittiesToStore = checkStore(securityToken, wikitties); - WikittyServiceEvent result = ws.store(securityToken, wikittiesToStore, force); + WikittyEvent result = ws.store(securityToken, wikittiesToStore, force); return result; } @@ -383,9 +383,9 @@ } @Override - public WikittyServiceEvent delete(String securityToken, Collection<String> ids) { + public WikittyEvent delete(String securityToken, Collection<String> ids) { checkDelete(securityToken, ids); - WikittyServiceEvent result = ws.delete(securityToken, ids); + WikittyEvent result = ws.delete(securityToken, ids); return result; } @@ -485,7 +485,7 @@ } @Override - public WikittyServiceEvent storeExtension(String securityToken, + public WikittyEvent storeExtension(String securityToken, Collection<WikittyExtension> exts) { checkStoreExtension(securityToken, exts); return ws.storeExtension(securityToken, exts); @@ -553,7 +553,7 @@ } @Override - public WikittyServiceEvent deleteTree(String securityToken, String treeNodeId) { + public WikittyEvent deleteTree(String securityToken, String treeNodeId) { WikittyTreeNode treeNode = ws.restoreNode(securityToken, treeNodeId, null).getKey(); Collection<Wikitty> wikitties = Arrays.asList(treeNode.getWikitty()); checkStore(securityToken, wikitties); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2010-11-15 17:04:29 UTC (rev 473) @@ -41,7 +41,7 @@ /** WikittyService used to store modified object */ protected WikittyService tx; - protected List<WikittyServiceEvent> events; + protected List<WikittyEvent> events; /** if autoCommit > 0 all time events numbers element equals to this * autoCommit commit is call */ @@ -52,7 +52,7 @@ // create new WikittyServiceInMemory not configured with default config // this WikittyServiceInMemory must be only in memory this.tx = new WikittyServiceInMemory(null); - events = new LinkedList<WikittyServiceEvent>(); + events = new LinkedList<WikittyEvent>(); } public void setAutoCommit(int autoCommit) { @@ -63,7 +63,7 @@ return autoCommit; } - protected void addEvent(String securityToken, WikittyServiceEvent e) { + protected void addEvent(String securityToken, WikittyEvent e) { events.add(e); if (autoCommit > 0 && events.size() >= autoCommit) { commit(securityToken); @@ -82,7 +82,7 @@ } @Override - public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void addWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { throw new UnsupportedOperationException( "You try to add listener on WikittyServiceTransaction," + "this is an error desgin, you must add WikittyServiceNotifier" @@ -90,7 +90,7 @@ } @Override - public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { + public void removeWikittyServiceListener(WikittyListener listener, ServiceListenerType type) { throw new UnsupportedOperationException( "You try to remove listener on WikittyServiceTransaction," + "this is an error desgin, you must add WikittyServiceNotifier" @@ -113,8 +113,8 @@ } @Override - public WikittyServiceEvent clear(String securityToken) { - WikittyServiceEvent e = tx.clear(securityToken); + public WikittyEvent clear(String securityToken) { + WikittyEvent e = tx.clear(securityToken); addEvent(securityToken, e); return e; } @@ -142,16 +142,16 @@ } @Override - public WikittyServiceEvent replay(String securityToken, List<WikittyServiceEvent> events) { - WikittyServiceEvent e = tx.replay(securityToken, events); + public WikittyEvent replay(String securityToken, List<WikittyEvent> events) { + WikittyEvent e = tx.replay(securityToken, events); events.add(e); return e; } @Override - public WikittyServiceEvent store( + public WikittyEvent store( String securityToken, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent e = tx.store(securityToken, wikitties, force); + WikittyEvent e = tx.store(securityToken, wikitties, force); addEvent(securityToken, e); return e; } @@ -179,9 +179,9 @@ } @Override - public WikittyServiceEvent storeExtension( + public WikittyEvent storeExtension( String securityToken, Collection<WikittyExtension> exts) { - WikittyServiceEvent e = tx.storeExtension(securityToken, exts); + WikittyEvent e = tx.storeExtension(securityToken, exts); addEvent(securityToken, e); return e; } @@ -230,13 +230,13 @@ } @Override - public WikittyServiceEvent delete(String securityToken, Collection<String> ids) { + public WikittyEvent 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, new ArrayList<String>(ids)); tx.store(securityToken, wikitties, true); - WikittyServiceEvent e = tx.delete(securityToken, ids); + WikittyEvent e = tx.delete(securityToken, ids); addEvent(securityToken, e); return e; } @@ -294,7 +294,7 @@ } @Override - public WikittyServiceEvent deleteTree(String securityToken, String treeNodeId) { + public WikittyEvent deleteTree(String securityToken, String treeNodeId) { throw new UnsupportedOperationException("Not supported yet."); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2010-11-15 17:04:29 UTC (rev 473) @@ -27,7 +27,7 @@ import org.nuiton.wikitty.services.WikittyServiceNotifier; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; @@ -140,7 +140,7 @@ } @Override - public void sendMessage(WikittyServiceEvent event) throws Exception { + public void sendMessage(WikittyEvent event) throws Exception { Message message = muc.createMessage(); message.setBody(event.getType().toString()); message.setProperty(PROPERTY_EVENT_NAME, event); @@ -165,8 +165,8 @@ log.debug("Receive message : " + event); } - if (event instanceof WikittyServiceEvent) { - ws.processRemoteEvent((WikittyServiceEvent)event); + if (event instanceof WikittyEvent) { + ws.processRemoteEvent((WikittyEvent)event); } } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorage.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorage.java 2010-11-15 17:04:29 UTC (rev 473) @@ -29,7 +29,7 @@ import java.util.List; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyTransaction; /** @@ -49,7 +49,7 @@ * @param extensions the extensions to store * @return information usefull for client side update data */ - WikittyServiceEvent store(WikittyTransaction transaction, + WikittyEvent store(WikittyTransaction transaction, Collection<WikittyExtension> extensions); /** @@ -106,6 +106,6 @@ * * @param transaction transaction */ - public WikittyServiceEvent clear(WikittyTransaction transaction); + public WikittyEvent clear(WikittyTransaction transaction); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorageInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorageInMemory.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyExtensionStorageInMemory.java 2010-11-15 17:04:29 UTC (rev 473) @@ -9,7 +9,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyTransaction; public class WikittyExtensionStorageInMemory implements WikittyExtensionStorage { @@ -29,8 +29,8 @@ } @Override - public WikittyServiceEvent store(WikittyTransaction transaction, Collection<WikittyExtension> exts) throws WikittyException { - WikittyServiceEvent result = new WikittyServiceEvent(this); + public WikittyEvent store(WikittyTransaction transaction, Collection<WikittyExtension> exts) throws WikittyException { + WikittyEvent result = new WikittyEvent(this); for (WikittyExtension ext : exts) { // on ajoute que s'il n'y est pas deja if (!extensions.containsKey(ext.getId())) { @@ -91,10 +91,10 @@ } @Override - public WikittyServiceEvent clear(WikittyTransaction transaction) { + public WikittyEvent clear(WikittyTransaction transaction) { extensions = new HashMap<String, WikittyExtension>(); - WikittyServiceEvent result = new WikittyServiceEvent(this); - result.addType(WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION); + WikittyEvent result = new WikittyEvent(this); + result.addType(WikittyEvent.WikittyEventType.CLEAR_EXTENSION); return result; } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java 2010-11-15 17:04:29 UTC (rev 473) @@ -28,7 +28,7 @@ import java.util.Collection; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyException; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyTransaction; /** @@ -52,7 +52,7 @@ * * @return information usefull for client side update data */ - public WikittyServiceEvent store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force); + public WikittyEvent store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force); /** * Return true if id exists in storage. @@ -93,7 +93,7 @@ * @return delete response * @throws WikittyException If id is not valid or don't exist. */ - public WikittyServiceEvent delete(WikittyTransaction transaction, Collection<String> idList) throws WikittyException; + public WikittyEvent delete(WikittyTransaction transaction, Collection<String> idList) throws WikittyException; /** * Scan all wikitties with specific scanner, even if the wikitty is deleted. @@ -115,6 +115,6 @@ * * @param transaction transaction */ - public WikittyServiceEvent clear(WikittyTransaction transaction); + public WikittyEvent clear(WikittyTransaction transaction); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2010-11-15 17:04:29 UTC (rev 473) @@ -8,7 +8,7 @@ import org.nuiton.wikitty.WikittyObsoleteException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyTransaction; public class WikittyStorageInMemory implements WikittyStorage { @@ -24,8 +24,8 @@ } @Override - public WikittyServiceEvent store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { - WikittyServiceEvent result = new WikittyServiceEvent(this); + public WikittyEvent store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { + WikittyEvent result = new WikittyEvent(this); for (Wikitty wikitty : wikitties) { // begin with clone of wikitty to prevent modification of // wikitty passed as argument @@ -91,8 +91,8 @@ } @Override - public WikittyServiceEvent delete(WikittyTransaction transaction, Collection<String> idList) throws WikittyException { - WikittyServiceEvent result = new WikittyServiceEvent(this); + public WikittyEvent delete(WikittyTransaction transaction, Collection<String> idList) throws WikittyException { + WikittyEvent result = new WikittyEvent(this); Date now = new Date(); for (String id : idList) { Wikitty w = restore(transaction, id); @@ -140,10 +140,10 @@ } @Override - public WikittyServiceEvent clear(WikittyTransaction transaction) { + public WikittyEvent clear(WikittyTransaction transaction) { wikitties = new LinkedHashMap<String, Wikitty>(); - WikittyServiceEvent result = new WikittyServiceEvent(this); - result.addType(WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY); + WikittyEvent result = new WikittyEvent(this); + result.addType(WikittyEvent.WikittyEventType.CLEAR_WIKITTY); return result; } } 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-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-11-15 17:04:29 UTC (rev 473) @@ -59,7 +59,7 @@ import org.nuiton.wikitty.WikittyObsoleteException; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.services.WikittyServiceEnhanced; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.search.operators.Element; import org.nuiton.wikitty.search.Search; @@ -353,7 +353,7 @@ for( Wikitty w : wikitties ) { oldIdVersion.put(w.getId(), w.getVersion()); } - WikittyServiceEvent response = ws.store(null, wikitties, false); + WikittyEvent response = ws.store(null, wikitties, false); for (Wikitty w : wikitties) { response.update(w); String v1 = w.getVersion(); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java 2010-11-15 17:04:29 UTC (rev 473) @@ -7,8 +7,8 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.WikittyService.ServiceListenerType; -import org.nuiton.wikitty.services.WikittyServiceEvent; -import org.nuiton.wikitty.services.WikittyServiceListener; +import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.services.WikittyListener; import org.nuiton.wikitty.services.WikittyServiceNotifier; /** @@ -26,7 +26,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceNotificationTest.class); - protected EnumSet<WikittyServiceEvent.WikittyEventType> lastEvent = null; + protected EnumSet<WikittyEvent.WikittyEventType> lastEvent = null; protected int nbEvent = 0; /** @@ -60,13 +60,13 @@ */ protected void sendEvent(WikittyServiceNotifier wsn, boolean hasListener) throws Exception { { - WikittyServiceEvent event = new WikittyServiceEvent("test"); - event.addType(WikittyServiceEvent.WikittyEventType.PUT_WIKITTY); + WikittyEvent event = new WikittyEvent("test"); + event.addType(WikittyEvent.WikittyEventType.PUT_WIKITTY); wsn.processRemoteEvent(event); wsn.getEventThread().waitFor(event.getTime()); if (hasListener) { Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.PUT_WIKITTY), + EnumSet.of(WikittyEvent.WikittyEventType.PUT_WIKITTY), lastEvent); } else { Assert.assertEquals(null, lastEvent); @@ -74,13 +74,13 @@ lastEvent = null; } { - WikittyServiceEvent event = new WikittyServiceEvent("test"); - event.addType(WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY); + WikittyEvent event = new WikittyEvent("test"); + event.addType(WikittyEvent.WikittyEventType.REMOVE_WIKITTY); wsn.processRemoteEvent(event); wsn.getEventThread().waitFor(event.getTime()); if (hasListener) { Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY), + EnumSet.of(WikittyEvent.WikittyEventType.REMOVE_WIKITTY), lastEvent); } else { Assert.assertEquals(null, lastEvent); @@ -88,13 +88,13 @@ lastEvent = null; } { - WikittyServiceEvent event = new WikittyServiceEvent("test"); - event.addType(WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY); + WikittyEvent event = new WikittyEvent("test"); + event.addType(WikittyEvent.WikittyEventType.CLEAR_WIKITTY); wsn.processRemoteEvent(event); wsn.getEventThread().waitFor(event.getTime()); if (hasListener) { Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY), + EnumSet.of(WikittyEvent.WikittyEventType.CLEAR_WIKITTY), lastEvent); } else { Assert.assertEquals(null, lastEvent); @@ -102,13 +102,13 @@ lastEvent = null; } { - WikittyServiceEvent event = new WikittyServiceEvent("test"); - event.addType(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION); + WikittyEvent event = new WikittyEvent("test"); + event.addType(WikittyEvent.WikittyEventType.PUT_EXTENSION); wsn.processRemoteEvent(event); wsn.getEventThread().waitFor(event.getTime()); if (hasListener) { Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION), + EnumSet.of(WikittyEvent.WikittyEventType.PUT_EXTENSION), lastEvent); } else { Assert.assertEquals(null, lastEvent); @@ -116,13 +116,13 @@ lastEvent = null; } { - WikittyServiceEvent event = new WikittyServiceEvent("test"); - event.addType(WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION); + WikittyEvent event = new WikittyEvent("test"); + event.addType(WikittyEvent.WikittyEventType.CLEAR_EXTENSION); wsn.processRemoteEvent(event); wsn.getEventThread().waitFor(event.getTime()); if (hasListener) { Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION), + EnumSet.of(WikittyEvent.WikittyEventType.CLEAR_EXTENSION), lastEvent); } else { Assert.assertEquals(null, lastEvent); @@ -134,49 +134,49 @@ /** * Class listener des events, check la bonne reception */ - class Listener implements WikittyServiceListener { + class Listener implements WikittyListener { @Override - public void putWikitty(WikittyServiceEvent event) { + public void putWikitty(WikittyEvent event) { nbEvent++; Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.PUT_WIKITTY), + EnumSet.of(WikittyEvent.WikittyEventType.PUT_WIKITTY), event.getType()); lastEvent = event.getType(); } @Override - public void removeWikitty(WikittyServiceEvent event) { + public void removeWikitty(WikittyEvent event) { nbEvent++; Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY), + EnumSet.of(WikittyEvent.WikittyEventType.REMOVE_WIKITTY), event.getType()); lastEvent = event.getType(); } @Override - public void clearWikitty(WikittyServiceEvent event) { + public void clearWikitty(WikittyEvent event) { nbEvent++; Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY), + EnumSet.of(WikittyEvent.WikittyEventType.CLEAR_WIKITTY), event.getType()); lastEvent = event.getType(); } @Override - public void putExtension(WikittyServiceEvent event) { + public void putExtension(WikittyEvent event) { nbEvent++; Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION), + EnumSet.of(WikittyEvent.WikittyEventType.PUT_EXTENSION), event.getType()); lastEvent = event.getType(); } @Override - public void clearExtension(WikittyServiceEvent event) { + public void clearExtension(WikittyEvent event) { nbEvent++; Assert.assertEquals( - EnumSet.of(WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION), + EnumSet.of(WikittyEvent.WikittyEventType.CLEAR_EXTENSION), event.getType()); lastEvent = event.getType(); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-11-15 17:04:29 UTC (rev 473) @@ -36,7 +36,7 @@ import org.jivesoftware.smackx.muc.MultiUserChat; import org.junit.Test; import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.XMPPNotifierTransporter; /** @@ -63,7 +63,7 @@ // Envoi d'un message avec le transporter normal XMPPNotifierTransporter xmpp = new XMPPNotifierTransporter(config, null); - WikittyServiceEvent event = new WikittyServiceEvent("test"); + WikittyEvent event = new WikittyEvent("test"); event.addRemoveDate("theId", new Date()); xmpp.sendMessage(event); Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-11-15 17:04:29 UTC (rev 473) @@ -62,7 +62,7 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.storage.WikittyExtensionStorage; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; @@ -127,10 +127,10 @@ } @Override - public WikittyServiceEvent store(WikittyTransaction transaction, + public WikittyEvent store(WikittyTransaction transaction, Collection<WikittyExtension> extensions) throws WikittyException { - WikittyServiceEvent result = new WikittyServiceEvent(this); + WikittyEvent result = new WikittyEvent(this); Connection connection = WikittyJDBCUtil.getConnection(config); try { for (WikittyExtension ext : extensions) { @@ -348,13 +348,13 @@ } @Override - public WikittyServiceEvent clear(WikittyTransaction transaction) { + public WikittyEvent clear(WikittyTransaction transaction) { Connection connection = WikittyJDBCUtil.getConnection(config); try { lastVersion = null; WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty(QUERY_CLEAR_EXTENSION)); - WikittyServiceEvent result = new WikittyServiceEvent(this); - result.addType(WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION); + WikittyEvent result = new WikittyEvent(this); + result.addType(WikittyEvent.WikittyEventType.CLEAR_EXTENSION); return result; } catch (Exception eee) { throw new WikittyException("Can't clear all extension", eee); Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-11-15 17:04:29 UTC (rev 473) @@ -78,7 +78,7 @@ import org.nuiton.wikitty.storage.WikittyExtensionStorage; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.WikittyObsoleteException; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.storage.WikittyStorage; import org.nuiton.wikitty.services.WikittyTransaction; import org.nuiton.wikitty.WikittyUtil; @@ -166,11 +166,11 @@ } @Override - public WikittyServiceEvent store(WikittyTransaction transaction, + public WikittyEvent store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) throws WikittyException { Connection connection = WikittyJDBCUtil.getConnection(config); try { - WikittyServiceEvent result = new WikittyServiceEvent(this); + WikittyEvent result = new WikittyEvent(this); for (Wikitty wikitty : wikitties) { String query = String.format(jdbcQuery.getProperty(QUERY_SELECT_TWO_WHERE), COL_VERSION, COL_DELETION_DATE, TABLE_WIKITTY_ADMIN, COL_ID); @@ -388,10 +388,10 @@ } @Override - public WikittyServiceEvent delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException { + public WikittyEvent delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException { Connection connection = WikittyJDBCUtil.getConnection(config); try { - WikittyServiceEvent result = new WikittyServiceEvent(this); + WikittyEvent result = new WikittyEvent(this); Date now = new Date(); for (String id : ids) { @@ -564,12 +564,12 @@ } @Override - public WikittyServiceEvent clear(WikittyTransaction transaction) { + public WikittyEvent clear(WikittyTransaction transaction) { Connection connection = WikittyJDBCUtil.getConnection(config); try { WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty(QUERY_CLEAR_WIKITTY)); - WikittyServiceEvent result = new WikittyServiceEvent(this); - result.addType(WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY); + WikittyEvent result = new WikittyEvent(this); + result.addType(WikittyEvent.WikittyEventType.CLEAR_WIKITTY); return result; } catch (SQLException eee) { throw new WikittyException("Can't clear wikitty data", eee); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-11-15 16:36:44 UTC (rev 472) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-11-15 17:04:29 UTC (rev 473) @@ -47,7 +47,7 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.services.WikittyServiceEvent; +import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.conform.StorageTest; import org.nuiton.wikitty.search.Search; @@ -400,7 +400,7 @@ WikittyTreeNodeImpl child = new WikittyTreeNodeImpl(); child.setParent(parent.getWikittyId()); - WikittyServiceEvent event = ws.store(null, child.getWikitty()); + WikittyEvent event = ws.store(null, child.getWikitty()); event.update(child.getWikitty()); Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, parent.getWikittyId(), null);