r486 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/addons wikitty-api/src/main/java/org/nuiton/wikitty/entities wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/main/java/org/nuiton/wikitty/storage wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-api/src/test/java/org/nuiton/wikitty/layers wikitty-generators/src/main/java/org/nuiton/wikitty/generator
Author: bpoussin Date: 2010-11-18 13:16:22 +0100 (Thu, 18 Nov 2010) New Revision: 486 Url: http://nuiton.org/repositories/revision/wikitty/486 Log: - rename BusinessEntityWikitty in BusinessEntityImpl - pass some FIXME to TODO and fix some other Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityWikitty.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.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/WikittyStorage.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.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-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.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/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-11-18 12:16:22 UTC (rev 486) @@ -27,7 +27,7 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.BusinessEntity; -import org.nuiton.wikitty.entities.BusinessEntityWikitty; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Criteria; @@ -125,12 +125,12 @@ */ public <E extends BusinessEntity> E cast(BusinessEntity source, Class<E> target) { E result = WikittyUtil.newInstance( - securityToken, wikittyService, target, ((BusinessEntityWikitty)source).getWikitty()); + securityToken, wikittyService, target, ((BusinessEntityImpl)source).getWikitty()); return result; } public <E extends BusinessEntity> E store(E e) { - Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); + Wikitty w = ((BusinessEntityImpl)e).getWikitty(); WikittyEvent resp = wikittyService.store(securityToken, w); // update object resp.update(w); @@ -148,7 +148,7 @@ // prepare data to send to service List<Wikitty> wikitties = new ArrayList<Wikitty>(objets.size()); for (E e : objets) { - Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); + Wikitty w = ((BusinessEntityImpl)e).getWikitty(); wikitties.add(w); } @@ -196,7 +196,7 @@ } if (checkExtension) { // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl - BusinessEntityWikitty b = (BusinessEntityWikitty)result; + BusinessEntityImpl b = (BusinessEntityImpl)result; Collection<WikittyExtension> BusinessEntityStaticExtensions = b.getStaticExtensions(); for (WikittyExtension ext : BusinessEntityStaticExtensions) { String extensionName = ext.getName(); @@ -263,7 +263,7 @@ securityToken, wikittyService, clazz, w); if (checkExtension) { // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl - BusinessEntityWikitty b = (BusinessEntityWikitty) dto; + BusinessEntityImpl b = (BusinessEntityImpl) dto; for (WikittyExtension ext : b.getStaticExtensions()) { if (!extNames.contains(ext.getName())) { // extension wanted by BusinessEntity (clazz) @@ -291,7 +291,16 @@ wikittyService.delete(securityToken, ids); } - public <E extends BusinessEntityWikitty> PagedResult<E> findAllByExample(E e, + /** + * Null field are not used in search request. + * + * @param e sample wikitty + * @param firstIndex + * @param endIndex + * @param fieldFacet + * @return + */ + public <E extends BusinessEntityImpl> PagedResult<E> findAllByExample(E e, int firstIndex, int endIndex, String ... fieldFacet ) { Criteria criteria = Search.query(e.getWikitty()).criteria() @@ -307,7 +316,13 @@ return result; } - public <E extends BusinessEntityWikitty> E findByExample(E e) { + /** + * Null field are not used in search request. + * + * @param e sample wikitty + * @return + */ + public <E extends BusinessEntityImpl> E findByExample(E e) { Criteria criteria = Search.query(e.getWikitty()).criteria(); Wikitty w = wikittyService.findByCriteria(securityToken, criteria); @@ -333,8 +348,8 @@ Class<E> clazz, Criteria criteria) { // newInstance only return BusinessEntityWikittyImpl - BusinessEntityWikitty sample = - (BusinessEntityWikitty)WikittyUtil.newInstance(clazz); + BusinessEntityImpl sample = + (BusinessEntityImpl)WikittyUtil.newInstance(clazz); Wikitty wikitty = sample.getWikitty(); Collection<String> extensions = wikitty.getExtensionNames(); @@ -395,8 +410,8 @@ } public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) { - BusinessEntityWikitty sample = - (BusinessEntityWikitty)WikittyUtil.newInstance(clazz); + BusinessEntityImpl sample = + (BusinessEntityImpl)WikittyUtil.newInstance(clazz); Wikitty wikitty = sample.getWikitty(); Collection<String> extensions = wikitty.getExtensionNames(); @@ -498,8 +513,8 @@ boolean goodType = true; if(checkExtension) { // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl - BusinessEntityWikitty businessEntityImpl = - (BusinessEntityWikitty) businessEntity; + BusinessEntityImpl businessEntityImpl = + (BusinessEntityImpl) businessEntity; Collection<WikittyExtension> staticExtensions = businessEntityImpl.getStaticExtensions(); @@ -547,7 +562,7 @@ "Can't retrieve wikitty needed for hasType test", eee); } // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl - BusinessEntityWikitty b = (BusinessEntityWikitty)result; + BusinessEntityImpl b = (BusinessEntityImpl)result; for (WikittyExtension ext : b.getStaticExtensions()) { if (!extNames.contains(ext.getName())) { // extension wanted by BusinessEntity (clazz) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-11-18 12:16:22 UTC (rev 486) @@ -30,7 +30,7 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.BusinessEntityWikitty; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.services.WikittyServiceEnhanced; import java.lang.reflect.Constructor; import java.math.BigDecimal; @@ -644,7 +644,7 @@ } } - if (!BusinessEntityWikitty.class + if (!BusinessEntityImpl.class .isAssignableFrom(clazzInstanciable)) { throw new WikittyException(String.format( "Your class '%s' don't extends WikittyDto", clazz @@ -689,7 +689,7 @@ } } - if (!BusinessEntityWikitty.class + if (!BusinessEntityImpl.class .isAssignableFrom(clazzInstanciable)) { throw new WikittyException(String.format( "Your class '%s' don't extends WikittyDto", clazz @@ -705,7 +705,7 @@ Object[] parms = { null }; result = (E) cons.newInstance(parms); - BusinessEntityWikitty bean = (BusinessEntityWikitty) result; + BusinessEntityImpl bean = (BusinessEntityImpl) result; checkExtensionVersion(securityToken, wikittyService, w, bean); bean.setWikitty(w); @@ -739,7 +739,7 @@ */ static public Wikitty checkExtensionVersion( String securityToken, WikittyService wikittyService, - Wikitty wikitty, BusinessEntityWikitty entity) { + Wikitty wikitty, BusinessEntityImpl entity) { Wikitty result = wikitty; boolean upgradeData = false; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyI18nImpl.java 2010-11-18 12:16:22 UTC (rev 486) @@ -7,7 +7,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.entities.BusinessEntityWikitty; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyI18nAbstract; @@ -51,7 +51,7 @@ * WikittyI18nImpl : * @param businessEntityWikitty */ - public WikittyI18nImpl(BusinessEntityWikitty businessEntityWikitty) { + public WikittyI18nImpl(BusinessEntityImpl businessEntityWikitty) { super(businessEntityWikitty.getWikitty()); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyImportExportService.java 2010-11-18 12:16:22 UTC (rev 486) @@ -40,7 +40,7 @@ import java.util.concurrent.Future; import java.util.concurrent.FutureTask; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.entities.BusinessEntityWikitty; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyException; @@ -165,7 +165,7 @@ * @param e sample * @return job id */ - public String asyncExportAllByExample(FORMAT format, BusinessEntityWikitty e) { + public String asyncExportAllByExample(FORMAT format, BusinessEntityImpl e) { Criteria criteria = Search.query(e.getWikitty()).criteria(); String result = asyncExportAllByCriteria(format, criteria); return result; @@ -178,7 +178,7 @@ * @param e sample * @return export string */ - public String syncExportAllByExample(FORMAT format, BusinessEntityWikitty e) { + public String syncExportAllByExample(FORMAT format, BusinessEntityImpl e) { Criteria criteria = Search.query(e.getWikitty()).criteria(); String result = syncExportAllByCriteria(format, criteria); return result; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2010-11-18 12:16:22 UTC (rev 486) @@ -38,7 +38,6 @@ * Last update: $Date$ * by : $Author$ */ -// FIXME poussin 20100528 voir si cette interface est reellement necessaire. On pourra renommer BusinessEntityWikitty en BusinessEntity public interface BusinessEntity extends Serializable, Cloneable { /** Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java (from rev 483, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityWikitty.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2010-11-18 12:16:22 UTC (rev 486) @@ -0,0 +1,188 @@ +/* + * #%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.entities; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.Collection; +import java.util.Collections; + +/** + * + * @author poussin + * @version $Revision$ + * + * Each business object will inherit of this class. + * + * Last update: $Date$ + * by : $Author$ + */ +public class BusinessEntityImpl implements BusinessEntity { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4399752739887114180L; + + /** + * Property change support. + * + * Warning, this transient field is null after deserialization. + */ + protected transient PropertyChangeSupport propertyChangeSupport; + + protected Wikitty wikitty; + + public BusinessEntityImpl(Wikitty wi) { + setWikitty(wi); + } + + public BusinessEntityImpl() { + this(new WikittyImpl()); + } + + protected PropertyChangeSupport getPropertyChangeSupport() { + if (propertyChangeSupport == null) { + propertyChangeSupport = new PropertyChangeSupport(this); + } + return propertyChangeSupport; + } + + @Override + public String getWikittyId() { + String result = getWikitty().getId(); + return result; + } + + @Override + public String getWikittyVersion() { + String result = getWikitty().getVersion(); + return result; + } + + @Override + public void setWikittyVersion(String version) { + getWikitty().setVersion(version); + } + + public void setWikitty(Wikitty wikitty) { + if(wikitty != null) { + for (WikittyExtension ext : getStaticExtensions()) { + wikitty.addExtension(ext); + } + } + this.wikitty = wikitty; + } + + /** + * @see BusinessEntity#getWikitty() + */ + @Override + public Wikitty getWikitty() { + return wikitty; + } + + @Override + public Collection<String> getExtensionNames() { + Collection<String> result = getWikitty().getExtensionNames(); + return result; + } + + @Override + public Collection<String> getExtensionFields(String ext) { + Collection<String> result = getWikitty().getExtension(ext).getFieldNames(); + return result; + } + + @Override + public FieldType getFieldType(String ext, String fieldName) { + FieldType result = getWikitty().getExtension(ext).getFieldType(fieldName); + return result; + } + + @Override + public Object getField(String ext, String fieldName) { + Object result = getWikitty().getFieldAsObject(ext, fieldName); + return result; + } + + @Override + public void setField(String ext, String fieldName, Object value) { + getWikitty().setField(ext, fieldName, value); + } + + public Collection<WikittyExtension> getStaticExtensions() { + return Collections.emptyList(); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (!BusinessEntityImpl.class.isAssignableFrom(obj.getClass())) { + return false; + } + BusinessEntityImpl w = (BusinessEntityImpl) obj; + return getWikittyId().equals(w.getWikittyId()); + } + + @Override + public int hashCode() { + return getWikittyId().hashCode(); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener) + */ + @Override + public void addPropertyChangeListener(PropertyChangeListener listener) { + getPropertyChangeSupport().addPropertyChangeListener(listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.beans.PropertyChangeListener) + */ + @Override + public void removePropertyChangeListener(PropertyChangeListener listener) { + getPropertyChangeSupport().removePropertyChangeListener(listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + */ + @Override + public void addPropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + getPropertyChangeSupport().addPropertyChangeListener(propertyName, listener); + } + + /* + * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) + */ + @Override + public void removePropertyChangeListener(String propertyName, + PropertyChangeListener listener) { + getPropertyChangeSupport().removePropertyChangeListener(propertyName, listener); + } +} Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityWikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityWikitty.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityWikitty.java 2010-11-18 12:16:22 UTC (rev 486) @@ -1,179 +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.entities; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.util.Collection; -import java.util.Collections; - -/** - * - * @author poussin - * @version $Revision$ - * - * Each business object will inherit of this class. - * - * Last update: $Date$ - * by : $Author$ - */ -public class BusinessEntityWikitty implements BusinessEntity { - - /** serialVersionUID. */ - private static final long serialVersionUID = -4399752739887114180L; - - /** - * Property change support. - * - * Warning, this transient field is null after deserialization. - */ - protected transient PropertyChangeSupport propertyChangeSupport; - - protected Wikitty wikitty; - - public BusinessEntityWikitty(Wikitty wi) { - setWikitty(wi); - } - - public BusinessEntityWikitty() { - this(new WikittyImpl()); - } - - protected PropertyChangeSupport getPropertyChangeSupport() { - if (propertyChangeSupport == null) { - propertyChangeSupport = new PropertyChangeSupport(this); - } - return propertyChangeSupport; - } - - public String getWikittyId() { - String result = getWikitty().getId(); - return result; - } - - public String getWikittyVersion() { - String result = getWikitty().getVersion(); - return result; - } - - public void setWikittyVersion(String version) { - getWikitty().setVersion(version); - } - - public void setWikitty(Wikitty wikitty) { - if(wikitty != null) { - for (WikittyExtension ext : getStaticExtensions()) { - wikitty.addExtension(ext); - } - } - this.wikitty = wikitty; - } - - /** - * @see BusinessEntity#getWikitty() - */ - public Wikitty getWikitty() { - return wikitty; - } - - public Collection<String> getExtensionNames() { - Collection<String> result = getWikitty().getExtensionNames(); - return result; - } - - public Collection<String> getExtensionFields(String ext) { - Collection<String> result = getWikitty().getExtension(ext).getFieldNames(); - return result; - } - - public FieldType getFieldType(String ext, String fieldName) { - FieldType result = getWikitty().getExtension(ext).getFieldType(fieldName); - return result; - } - - public Object getField(String ext, String fieldName) { - Object result = getWikitty().getFieldAsObject(ext, fieldName); - return result; - } - - public void setField(String ext, String fieldName, Object value) { - getWikitty().setField(ext, fieldName, value); - } - - public Collection<WikittyExtension> getStaticExtensions() { - return Collections.emptyList(); - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (!BusinessEntityWikitty.class.isAssignableFrom(obj.getClass())) { - return false; - } - BusinessEntityWikitty wikitty = (BusinessEntityWikitty) obj; - return getWikittyId().equals(wikitty.getWikittyId()); - } - - @Override - public int hashCode() { - return getWikittyId().hashCode(); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener) - */ - @Override - public void addPropertyChangeListener(PropertyChangeListener listener) { - getPropertyChangeSupport().addPropertyChangeListener(listener); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.beans.PropertyChangeListener) - */ - @Override - public void removePropertyChangeListener(PropertyChangeListener listener) { - getPropertyChangeSupport().removePropertyChangeListener(listener); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) - */ - @Override - public void addPropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - getPropertyChangeSupport().addPropertyChangeListener(propertyName, listener); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) - */ - @Override - public void removePropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - getPropertyChangeSupport().removePropertyChangeListener(propertyName, listener); - } -} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2010-11-18 12:16:22 UTC (rev 486) @@ -102,15 +102,21 @@ } } + /** + * ATTENTION, la condition d'egalite n'est pas faire sur le type d'objet, + * mais seulement sur le contenu des donnees. Le equals repond a la question + * "Est-ce qu'on represente le meme wikitty ?". + * + * @param obj + * @return + */ @Override public boolean equals(Object obj) { - // FIXME 20100804 bleny side-effect ? return target.equals(obj); } @Override public int hashCode() { - // FIXME 20100804 bleny side-effect ? return target.hashCode(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2010-11-18 12:16:22 UTC (rev 486) @@ -68,7 +68,6 @@ * * Warning : Multiples extensions are not supported yet. * - * FIXME EC-20100420 multiples extensions need to work */ protected String requires; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2010-11-18 12:16:22 UTC (rev 486) @@ -35,7 +35,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.entities.BusinessEntityWikitty; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.entities.WikittyExtension; @@ -100,7 +100,7 @@ * @return new PagedResult, this result can have less elements that original * for some reason (security, ...) */ - public <E extends BusinessEntityWikitty> PagedResult<E> cast( + public <E extends BusinessEntityImpl> PagedResult<E> cast( WikittyProxy proxy, Class<E> clazz) { return cast(proxy, clazz, true); } @@ -154,7 +154,7 @@ * @return new PagedResult, this result can have less elements that original * for some reason (security, ...) */ - public <E extends BusinessEntityWikitty> PagedResult<E> cast( + public <E extends BusinessEntityImpl> PagedResult<E> cast( WikittyProxy proxy, Class<E> clazz, boolean autoconvert) { List<E> castedResult; @@ -175,8 +175,8 @@ Wikitty w = null; if (t instanceof Wikitty) { w = (Wikitty) t; - } else if (t instanceof BusinessEntityWikitty) { - w = ((BusinessEntityWikitty) t).getWikitty(); + } else if (t instanceof BusinessEntityImpl) { + w = ((BusinessEntityImpl) t).getWikitty(); } else { throw new WikittyException(String.format( "Illegal object result class '%s' can't convert it to wikitty", Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-11-18 12:16:22 UTC (rev 486) @@ -66,6 +66,7 @@ /** * Create Search query with field in wikitty argument. + * Null field are not used in search request. * * @param wikitty example use to create query * @return query @@ -80,7 +81,7 @@ for (String fqfieldName : wikitty.fieldNames()) { Object value = wikitty.getFqField(fqfieldName); - if (value != null) { // FIXME poussin 20090830 how to search for null value in field ? + if (value != null) { FieldType type = wikitty.getFieldType(fqfieldName); if (type.isCollection()) { Collection<?> collection = (Collection<?>) value; 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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2010-11-18 12:16:22 UTC (rev 486) @@ -277,7 +277,7 @@ @Override public Map<WikittyTreeNode, Integer> restoreChildren( String securityToken, String wikittyId, Criteria filter) { - // FIXME lookup in cache, and put in cache + // TODO lookup in cache, and put in cache return ws.restoreChildren(securityToken, wikittyId, filter); } @@ -304,7 +304,7 @@ @Override public Entry<WikittyTreeNode, Integer> restoreNode( String securityToken, String wikittyId, Criteria filter) { - // FIXME lookup in cache, and put in cache + // TODO lookup in cache, and put in cache return ws.restoreNode(securityToken, wikittyId, filter); } @@ -316,7 +316,7 @@ */ @Override public WikittyTree restoreTree(String securityToken, String wikittyId) { - // FIXME lookup in cache, and put in cache + // TODO lookup in cache, and put in cache return ws.restoreTree(securityToken, wikittyId); } 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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceImpl.java 2010-11-18 12:16:22 UTC (rev 486) @@ -82,7 +82,7 @@ protected WikittyStorage wikittyStorage; /** - * FIXME poussin 20101027 remove it when all used WikittyServiceHelper.build + * TODO poussin 20101027 remove it when all used WikittyServiceHelper.build * * Used by specific child * {@link org.nuiton.wikitty.jdbc.WikittyServiceJDBC} @@ -529,22 +529,6 @@ } } -// @Override -// public Wikitty restore(String securityToken, String id) { -// WikittyTransaction transaction = new WikittyTransaction(); -// try { -// transaction.begin(); -// -// Wikitty result = restore(securityToken, transaction, id); -// -// transaction.commit(); -// return result; -// } catch (Exception eee) { -// transaction.rollback(); -// throw new WikittyException("Can't restore wikitty", eee); -// } -// } - // FIXME poussin 20101029 use WikittyServiceTransaction and remove other transaction protected Wikitty upgradeData(String securityToken, WikittyTransaction transaction, Wikitty wikitty) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemory.java 2010-11-18 12:16:22 UTC (rev 486) @@ -42,7 +42,10 @@ import org.nuiton.wikitty.WikittyConfig; /** - * In memory implementation of WikittyService, currently used for test only. + * WARNING In memory implementation of WikittyService, currently used for test only. + * + * If you want in memory wikitty, you must use h2 and solr int inmemory mode + * (show configuration sample) * * @author poussin * @version $Revision$ @@ -52,8 +55,8 @@ */ public class WikittyServiceInMemory extends WikittyServiceImpl { - //FIXME InMemory implementation is not usable for production. Must be reviewed. - //FIXME The version increment must be done in 'prepare' method + //TODO InMemory implementation is not usable for production. Must be reviewed. + //TODO The version increment must be done in 'prepare' method /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceInMemory.class); 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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2010-11-18 12:16:22 UTC (rev 486) @@ -51,6 +51,8 @@ this.ws = ws; // create new WikittyServiceInMemory not configured with default config // this WikittyServiceInMemory must be only in memory + // FIXME poussin 20101118 use configuration to retrive transaction + // in memory implementation to used. Default must be h2+solr in memory mode this.tx = new WikittyServiceInMemory(null); events = new LinkedList<WikittyEvent>(); } @@ -271,7 +273,7 @@ } int firstIndice = resultWs.getFirstIndice(); - // FIXME le resultat est faut, le nombre total n'est pas la somme des deux :( + // FIXME le resultat est faux, le nombre total n'est pas la somme des deux :( int numFound = resultTx.getNumFound() + resultWs.getNumFound(); String queryString = resultWs.getQueryString(); // FIXME les facettes sont fausses :( 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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/XMPPNotifierTransporter.java 2010-11-18 12:16:22 UTC (rev 486) @@ -55,9 +55,6 @@ * Configuration * <li>wikitty.xmpp.server = adresse du serveur (ex: im.codelutin.com) * <li>wikitty.xmpp.room = adresse de la room (ex: wikitty-event@im.codelutin.com) - * <li>wikitty.notification.persistent = [true|false] indique si on doit - * recevoir tous les messages sans en loupe un seul. Pour cela il faut que la - * room soit archivee. (FIXME poussin 20101014 pas encore implantee) * * @author poussin * @version $Revision$ 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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java 2010-11-18 12:16:22 UTC (rev 486) @@ -86,11 +86,12 @@ String ... fqFieldName) throws WikittyException; /** - * Delete all object with id argument. + * Delete all object with id argument. Delete don't fail if wikitty + * don't existe or is already deleted. * * @param transaction transaction * @param idList - * @return delete response + * @return delete response (can be empty if no wikitty are realy deleted * @throws WikittyException If id is not valid or don't exist. */ public WikittyEvent delete(WikittyTransaction transaction, Collection<String> idList) throws WikittyException; 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-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-11-18 12:16:22 UTC (rev 486) @@ -43,7 +43,7 @@ public class SearchTest extends AbstractTestConformance { /* - * FIXME Will contains all conformance tests to the search features. + * TODO Will contains all conformance tests to the search features. */ public void testSearch() throws Exception { 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-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2010-11-18 12:16:22 UTC (rev 486) @@ -30,7 +30,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Properties; import org.junit.Before; import org.junit.Test; 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-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-11-18 12:16:22 UTC (rev 486) @@ -75,7 +75,7 @@ new WikittyServiceSecurity(config, inMemoryService); /** / - // FIXME 20101005 bleny implementation should be able to allow + // TODO 20101005 bleny implementation should be able to allow // passing trough two security layers securityService = new WikittyServiceSecurity(securityService); /**/ Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-11-18 12:16:22 UTC (rev 486) @@ -106,7 +106,7 @@ WikittyTransformerUtil.businessEntityToAbstractName(clazz), clazz.getPackageName()); processedClasses.put(clazz, abstractClass); - setSuperClass(abstractClass, "BusinessEntityWikitty"); + setSuperClass(abstractClass, "BusinessEntityImpl"); addInterface(abstractClass, clazz.getQualifiedName()); } @@ -187,10 +187,10 @@ }*/); constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); - addParameter(constructor, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN, "businessEntityWikitty"); + addParameter(constructor, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN, "businessEntityImpl"); setOperationBody(constructor, "" /*{ - super(businessEntityWikitty.getWikitty()); + super(businessEntityImpl.getWikitty()); }*/); } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-11-18 12:16:22 UTC (rev 486) @@ -125,10 +125,10 @@ }*/); constructor = addConstructor(implementation, ObjectModelModifier.PUBLIC); - addParameter(constructor, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN, "businessEntityWikitty"); + addParameter(constructor, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN, "businessEntityImpl"); setOperationBody(constructor, "" /*{ - super(businessEntityWikitty.getWikitty()); + super(businessEntityImpl.getWikitty()); }*/); } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-11-18 12:16:22 UTC (rev 486) @@ -41,7 +41,7 @@ protected static final String BUSINESS_ENTITY_CLASS_FQN = ENTITY_PACKAGE + ".BusinessEntity"; protected static final String BUSINESS_ENTITY_WIKITTY_CLASS_FQN = - ENTITY_PACKAGE + ".BusinessEntityWikitty"; + ENTITY_PACKAGE + ".BusinessEntityImpl"; protected static final String WIKITTY_CLASS_FQN = ENTITY_PACKAGE + ".Wikitty"; protected static final String WIKITTY_EXTENSION_CLASS_FQN = Modified: trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-hessian-client/src/main/java/org/nuiton/wikitty/services/WikittyServiceSlave.java 2010-11-18 12:16:22 UTC (rev 486) @@ -43,13 +43,6 @@ * jouer. Car on peut rejouer plusieurs fois l'event sans qu'il y ait de * probleme. Il faut juste que l'on ne loupe pas d'event. * - * (FIXME poussin 20101118 verifier que ca ne pose pas de probleme avec - * les numeros de version)(en fait il faudrait pour le replay utiliser par le - * slave avoir un argument force en plus pour que les numeros de version soit - * identique sur le master et le slave. Il faut verifier pourquoi lorsqu'on - * demande un force il peut y avoir un "Wikitty is obsolete" ce qui ne permet - * pas de rejouer plusieurs fois les events) - * * @author poussin * @version $Revision$ * 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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-11-18 12:16:22 UTC (rev 486) @@ -91,11 +91,6 @@ /** cache for last extension version; key: extName value: extVersion */ transient protected Map<String, String> lastVersion = null; - - // FIXME REMOVE IT -// public WikittyExtensionStorageJDBC() { -// this(null); -// } public WikittyExtensionStorageJDBC(ApplicationConfig config) { this.config = config; Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-11-18 12:16:22 UTC (rev 486) @@ -151,17 +151,6 @@ static final public String QUERY_INSERT_EXTENSION_DATA = "jdbc.queries.insert.extension.data"; -// /** JDBC JDBC_DRIVER property name */ -// static protected String JDBC_DRIVER = "jdbc.con.driver"; -// /** JDBC_HOST property name */ -// static protected String JDBC_HOST = "jdbc.con.host"; -// /** JDBC_USER_NAME property name */ -// static protected String JDBC_USER_NAME = "jdbc.con.userName"; -// /** JDBC_PASSWORD property name */ -// static protected String JDBC_PASSWORD = "jdbc.con.password"; -// /** JDBC_XADATASOURCE property name */ -// static protected String JDBC_XADATASOURCE = "jdbc.xadatasource"; - /** admin table name */ static protected String TABLE_WIKITTY_ADMIN = "wikitty_admin"; /** data table name */ @@ -180,12 +169,9 @@ */ public static synchronized Properties loadQuery(ApplicationConfig config) { Properties result = new Properties(); -// Properties databaseConfig = new Properties(queryConfig); InputStream streamQuery = null; -// InputStream streamConfig = null; try { - // FIXME poussin 20100112 perhaps used nuitonutil.ApplicationConfig String wikittyQueryFile = config.getOption( WikittyConfig.Option.WIKITTY_STORAGE_JDBC_QUERY_FILE.getKey()); @@ -202,39 +188,12 @@ // url can't be null streamQuery = url.openStream(); result.load(streamQuery); - - // FIXME REMOVE IT -// // config -// url = ClassLoader.getSystemResource("wikitty-jdbc-config.properties"); -// if (url == null) { -// ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); -// url = contextClassLoader.getResource("wikitty-jdbc-config.properties"); -// } -// -// if (url == null) { -// if (log.isInfoEnabled()) { -// log.info("No wikitty-jdbc-config.properties file found in classpath (skip default configuration loading)"); -// } -// } -// else { -// if (log.isInfoEnabled()) { -// log.info("Reading resource from: " + url); -// } -// streamConfig = url.openStream(); -// databaseConfig.load(streamConfig); -// } -// -// // extra config -// if (properties != null) { -// databaseConfig.putAll(properties); -// } } catch (IOException eee) { throw new WikittyException("Unable to load property file", eee); } finally { IOUtils.closeQuietly(streamQuery); -// IOUtils.closeQuietly(streamConfig); } return result; @@ -261,7 +220,7 @@ WikittyConfig.Option.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); String xaDataSourceClassName = conf.getOption( - WikittyConfig.Option.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey());; + WikittyConfig.Option.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); try { TransactionManager transactionManager = com.arjuna.ats.jta.TransactionManager.transactionManager(); Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-11-18 12:16:22 UTC (rev 486) @@ -43,13 +43,6 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(WikittyServiceJDBC.class); - // FIXME REMOVE IT -// public WikittyServiceJDBC() { -// extensionStorage = new WikittyExtensionStorageJDBC(); -// wikittyStorage = new WikittyStorageJDBC(extensionStorage); -// searchEngin = new WikittySearchEnginSolr(extensionStorage); -// } - public WikittyServiceJDBC(ApplicationConfig config) { extensionStorage = new WikittyExtensionStorageJDBC(config); wikittyStorage = new WikittyStorageJDBC(config, extensionStorage); 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-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-11-18 12:16:22 UTC (rev 486) @@ -106,11 +106,6 @@ protected WikittyExtensionStorage extensionStorage; - // FIXME REMOVE IT -// public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage) { -// this(extensionStorage, null); -// } - public WikittyStorageJDBC(ApplicationConfig config, WikittyExtensionStorage extensionStorage) { this.config = config; this.extensionStorage = extensionStorage; @@ -208,6 +203,9 @@ } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer newVersion = requestedVersion; } else { //requested version is obsolete +// FIXME poussin 20101118 pourquoi lorsqu'on +// demande un force il peut y avoir un "Wikitty is obsolete" ce qui ne permet +// pas de rejouer plusieurs fois les events pour les besoins du slave :( throw new WikittyObsoleteException(String.format( "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); } @@ -395,20 +393,12 @@ Date now = new Date(); for (String id : ids) { - // FIXME poussin 20100114 perhaps, it's not necessary to throw exception for that - // if no exception needed, suppresse problem of tx in tx - if (!exists(transaction, id)) { - throw new WikittyException(String.format( - "Wikitty with id '%s' doesn't exists", id)); - } else if (isDeleted(transaction, id)) { - throw new WikittyException(String.format( - "Wikitty with id '%s' is already deleted", id)); + if (exists(transaction, id) && !isDeleted(transaction, id)) { + // addVersionUpdate delete date field + WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty( + QUERY_DELETE_WIKITTY_ADMIN), id); + result.addRemoveDate(id, now); } - // addVersionUpdate delete date field - WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty( - QUERY_DELETE_WIKITTY_ADMIN), id); - result.addRemoveDate(id, now); - } return result; Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-11-18 12:16:22 UTC (rev 486) @@ -88,7 +88,7 @@ this(null, dummyFieldModifier); } - // FIXME 20101201 jru improve manage transaction and fieldModifeir in helper + // TODO 20101201 jru improve manage transaction and fieldModifeir in helper public Restriction2Solr(WikittyTransaction transaction, WikittySearchEnginSolr.FieldModifier fieldModifer) { this.transaction = transaction; this.fieldModifer = fieldModifer; Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-11-18 12:16:22 UTC (rev 486) @@ -475,16 +475,6 @@ /** JTA resource */ protected SolrResource solrResource; - // FIXME REMOVE IT -// /** -// * Init wikitty search engin on solr embedded server. -// * -// * @param extensionStorage extension storage -// */ -// public WikittySearchEnginSolr(WikittyExtensionStorage extensionStorage) { -// this(extensionStorage, null); -// } - /** * Init wikitty search engin on solr embedded server. * Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-11-18 11:32:52 UTC (rev 485) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-11-18 12:16:22 UTC (rev 486) @@ -158,7 +158,7 @@ SolrDocument result = findById(solrServer, "1"); assertNotNull(result); - // Normaly the value is null, if SolrServer is thread self + // Normaly the value is null, if SolrServer is thread safe result = findById(solrServer, "2"); assertNotNull(result); }
participants (1)
-
bpoussin＠users.nuiton.org