Author: sletellier Date: 2010-12-14 18:30:59 +0100 (Tue, 14 Dec 2010) New Revision: 609 Url: http://nuiton.org/repositories/revision/wikitty/609 Log: - Clean imports - Fix bug #1148 (http://www.nuiton.org/issues/show/1148) - Add test for no regression Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2010-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Criteria.java 2010-12-14 17:30:59 UTC (rev 609) @@ -53,7 +53,6 @@ * by : $Author$ */ public class Criteria implements Serializable { - /** serialVersionUID. */ private static final long serialVersionUID = 2590223960861630283L; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2010-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2010-12-14 17:30:59 UTC (rev 609) @@ -273,7 +273,10 @@ } else { if (type.contains(WikittyEventType.PUT_WIKITTY)) { Wikitty newWikitty = getWikitties().get(id); - e.replaceWith(newWikitty); + // can be null if wikitty is already saved (uptodate), then this wikitty is not re-saved + if (newWikitty != null) { + e.replaceWith(newWikitty); + } } if (type.contains(WikittyEventType.REMOVE_WIKITTY)) { Date date = getRemoveDate().get(id); 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-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-12-14 17:30:59 UTC (rev 609) @@ -45,6 +45,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; +import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.search.PagedResult; @@ -57,8 +58,6 @@ import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.addons.WikittyLabelUtil; import org.nuiton.wikitty.WikittyObsoleteException; -import org.nuiton.wikitty.WikittyProxy; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; @@ -671,4 +670,22 @@ Assert.assertEquals("LeBin", restoredWikitty.getFieldAsString(extName, "name")); Assert.assertEquals(bytes, restoredWikitty.getFieldAsBytes(extName, "content")); } + + @Test + public void testStoreUnmodifiedEntity() { + WikittyLabel wikitty1 = new WikittyLabelImpl(); + WikittyLabel wikitty2 = new WikittyLabelImpl(); + + List<WikittyLabel> toStore = new ArrayList<WikittyLabel>(); + Collections.addAll(toStore, wikitty1, wikitty2); + List<WikittyLabel> stored = getProxy().store(toStore); + + stored.get(0).addLabels("lbl"); + + try { + getProxy().store(toStore); + } catch (Exception eee) { + Assert.fail(); + } + } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java 2010-12-13 17:12:21 UTC (rev 608) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/BusinessEntityImplTest.java 2010-12-14 17:30:59 UTC (rev 609) @@ -1,17 +1,9 @@ package org.nuiton.wikitty.entities; - -import java.beans.PropertyDescriptor; -import java.util.Arrays; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.WikittyLabel; -import org.nuiton.wikitty.entities.WikittyLabelImpl; /** *