- Wikitty-commits - mailman.cloud.codelutin.com

r566 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 07 Dec '10

07 Dec '10

Author: bpoussin Date: 2010-12-07 01:43:56 +0100 (Tue, 07 Dec 2010) New Revision: 566 Url: http://nuiton.org/repositories/revision/wikitty/566 Log: add configuration variable wikitty.data.directory, this permit to change easily all data file storage in one line Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-03 18:01:20 UTC (rev 565) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-07 00:43:56 UTC (rev 566) @@ -126,6 +126,11 @@ _("Main configuration wikitty file"), "wikitty-config.properties", String.class, true, true), + WIKITTY_DATA_DIR( + "wikitty.data.directory", + _("Data directory where wikitty store data"), + "./target/data", String.class, false, false), + WIKITTY_STORAGE_JDBC_QUERY_FILE( "wikitty.storage.jdbc.queryfile", _("JDBC query configuration file"), @@ -138,7 +143,7 @@ WIKITTY_STORAGE_JDBC_URL( "wikitty.storage.jdbc.host", _("JDBC url"), - "jdbc:h2:file:./target/data/db", String.class, false, false), + "jdbc:h2:file:${" + WIKITTY_DATA_DIR + "}/db", String.class, false, false), WIKITTY_STORAGE_JDBC_LOGIN( "wikitty.storage.jdbc.login", _("JDBC login name"), @@ -170,7 +175,7 @@ WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA( "wikitty.searchengine.solr.directory.data", _("Solr data directory"), - "./target/data/solr", File.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/solr", File.class, false, false), WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( "wikitty.searchengine.solr.directory.factory", _("SolR storage type possible value: solr.StandardDirectoryFactory" @@ -192,7 +197,7 @@ WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE_FILE( "wikitty.WikittyServiceInMemory.persistence.file", _("Fichier ou les donnees sont stocker"), - "/tmp/wikitty-inmemory.ser", File.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/wikitty-inmemory.ser", File.class, false, false), WIKITTY_WIKITTYSERVICESTORAGE_COMPONENTS( @@ -232,11 +237,11 @@ WIKITTY_EXPORT_DIRECTORY( "wikitty.addon.export.directory", _("directory path where export asynchronous file are stored"), - "/tmp", String.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/export", String.class, false, false), WIKITTY_EXPORT_PUBLICURL( "wikitty.addon.export.publicurl", _("url used by client to retrieve export file when job is ended"), - "file:///tmp/", String.class, false, false), + "file://${" + WIKITTY_DATA_DIR + "}/export/", String.class, false, false), WIKITTY_CACHE_RESTORE_COPIES( "wikitty.service.cache.allwaysRestoreCopies", @@ -274,7 +279,7 @@ WIKITTY_SLAVE_SYNC_STATE_FILE( "wikitty.service.slave.sync.state.file", _("File path to store synchronisation state"), - "./target/data/syncState", String.class, false, false), + "${" + WIKITTY_DATA_DIR + "}/syncState", String.class, false, false), WIKITTY_SLAVE_MASTER_URL( "wikitty.service.slave.master.hessian.endpoint", _("Master url service, where to delegate modification action"),

1 0

r565 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 19:01:20 +0100 (Fri, 03 Dec 2010) New Revision: 565 Url: http://nuiton.org/repositories/revision/wikitty/565 Log: fix big bug in toWikitty that call toString on WikittyCopyOnWrite and not getId (bad instanceof) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-12-03 17:58:41 UTC (rev 564) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-12-03 18:01:20 UTC (rev 565) @@ -529,7 +529,7 @@ if (value != null) { if (value instanceof String) { result = (String) value; - } else if (value instanceof WikittyImpl) { + } else if (value instanceof Wikitty) { result = ((Wikitty) value).getId(); } else if (value instanceof BusinessEntity) { result = ((BusinessEntity) value).getWikittyId();

1 0

r564 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 18:58:41 +0100 (Fri, 03 Dec 2010) New Revision: 564 Url: http://nuiton.org/repositories/revision/wikitty/564 Log: refactor: use WikittyTreeNodeHelper to simplify code Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java 2010-12-03 17:13:30 UTC (rev 563) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java 2010-12-03 17:58:41 UTC (rev 564) @@ -71,6 +71,7 @@ import java.io.File; import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; /** * @@ -255,7 +256,7 @@ return null; } parentId = (String) doc.getFieldValue(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); - parents.put(nodeId, parentId); + putParent(nodeId, parentId); } Collection<String> deletedDocIds = solrResource.getDeletedDocs(); @@ -543,7 +544,7 @@ if (w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { - Set<String> attachments = w.getFieldAsSet(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); + Set<String> attachments = WikittyTreeNodeHelper.getAttachment(w); reindexChildTreeNode.putIncludedAttachments(id, attachments); // Search deleted children @@ -566,7 +567,7 @@ } // Get new parent id (may be the same old parent) - String parentId = w.getFieldAsString(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); + String parentId = WikittyTreeNodeHelper.getParent(w); reindexChildTreeNode.putParent(id, parentId); }

1 0

r563 - trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 18:13:30 +0100 (Fri, 03 Dec 2010) New Revision: 563 Url: http://nuiton.org/repositories/revision/wikitty/563 Log: suppress System.out.println added to debug Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-12-03 17:12:47 UTC (rev 562) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-12-03 17:13:30 UTC (rev 563) @@ -85,7 +85,6 @@ WikittyUtil.versionEquals(secondLabel.getWikittyVersion(), dto.getWikittyVersion())); - System.out.println("vdto: " + dto.getWikittyVersion() + " vs: " + secondLabel.getWikittyVersion()); //Second entity=>dto conversion test, modifications on dto //modify dto dto.addLabels("toto"); @@ -99,7 +98,6 @@ Assert.assertEquals(dto.getLabels(), thirdLabel.getLabels()); //Check that version have been updated (for storing) - System.out.println("v: " + thirdLabel.getWikittyVersion() + " vs: " + secondLabel.getWikittyVersion()); Assert.assertTrue( WikittyUtil.versionGreaterThan(thirdLabel.getWikittyVersion(), secondLabel.getWikittyVersion()));

1 0

r562 - trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 18:12:47 +0100 (Fri, 03 Dec 2010) New Revision: 562 Url: http://nuiton.org/repositories/revision/wikitty/562 Log: fix bad test Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-12-03 17:12:17 UTC (rev 561) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-12-03 17:12:47 UTC (rev 562) @@ -61,7 +61,7 @@ label.addLabels("Test"); //store entity - proxy.store(label); + label = proxy.store(label); //make conversion WikittyLabel dto = DTOHelper.toDto(label); @@ -85,6 +85,7 @@ WikittyUtil.versionEquals(secondLabel.getWikittyVersion(), dto.getWikittyVersion())); + System.out.println("vdto: " + dto.getWikittyVersion() + " vs: " + secondLabel.getWikittyVersion()); //Second entity=>dto conversion test, modifications on dto //modify dto dto.addLabels("toto"); @@ -98,9 +99,10 @@ Assert.assertEquals(dto.getLabels(), thirdLabel.getLabels()); //Check that version have been updated (for storing) + System.out.println("v: " + thirdLabel.getWikittyVersion() + " vs: " + secondLabel.getWikittyVersion()); Assert.assertTrue( WikittyUtil.versionGreaterThan(thirdLabel.getWikittyVersion(), - dto.getWikittyVersion())); + secondLabel.getWikittyVersion())); } } \ No newline at end of file

1 0

r561 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 18:12:17 +0100 (Fri, 03 Dec 2010) New Revision: 561 Url: http://nuiton.org/repositories/revision/wikitty/561 Log: fix bug in getWikittyVersion if no modification no add modifCount to version Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-03 17:11:45 UTC (rev 560) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-03 17:12:17 UTC (rev 561) @@ -465,7 +465,10 @@ addAnnotation(dtoClass, getWikittyVersion, "Override"); setOperationBody(getWikittyVersion, "" /*{ - String result = wikittyVersion + "." + modificationCount; + String result = wikittyVersion; + if (modificationCount > 0) { + result += "." + modificationCount; + } return result; }*/);

1 0

r560 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 18:11:45 +0100 (Fri, 03 Dec 2010) New Revision: 560 Url: http://nuiton.org/repositories/revision/wikitty/560 Log: fix bug in restore. We must return copy of instance in storage Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 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-12-03 16:12:58 UTC (rev 559) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2010-12-03 17:11:45 UTC (rev 560) @@ -32,6 +32,7 @@ import org.nuiton.wikitty.WikittyObsoleteException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyCopyOnWrite; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyTransaction; @@ -152,6 +153,10 @@ if (result.isDeleted()) { result = null; } + + // we must return copy on write, otherwize if two call to restore is done + // we return the same instance and it's very bad :( + result = new WikittyCopyOnWrite(result); return result; }

1 0

r559 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 17:12:58 +0100 (Fri, 03 Dec 2010) New Revision: 559 Url: http://nuiton.org/repositories/revision/wikitty/559 Log: add new method to addLabel Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java 2010-12-03 15:52:10 UTC (rev 558) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/WikittyLabelUtil.java 2010-12-03 16:12:58 UTC (rev 559) @@ -34,6 +34,8 @@ import org.nuiton.wikitty.entities.WikittyLabelHelper; import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.entities.BusinessEntity; +import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.search.Search; /** @@ -51,8 +53,35 @@ static private Log log = LogFactory.getLog(WikittyLabelUtil.class); /** - * Add new lable to the wikitty object. + * Add label on this wikitty. You must store your wikitty after + * @param wikitty + * @param label + */ + static public void addLabel(Wikitty wikitty, String label) { + if (!WikittyLabelHelper.hasExtension(wikitty)) { + WikittyLabelHelper.addExtension(wikitty); + } + WikittyLabelHelper.addLabels(wikitty, label); + } + /** + * Add label on this entity. You must store your entiry after * + * @param entity + * @param label + */ + static public void addLabel(BusinessEntityImpl entity, String label) { + Wikitty w = entity.getWikitty(); + addLabel(w, label); + } + + /** + * Add new lable to the wikitty object. You must only used this method, if + * you don't have the Wikitty Object because this method restore and save + * version in WikittyService. If you have Wikitty present in your space, your + * wikitty become obsolete and you lose your change :( + * + * If you have wikitty or business entity you must used {@link #} + * * @param proxy * @param wikittyId object'id * @param label label to add

1 0

r558 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/storage test/java/org/nuiton/wikitty/addons
by bpoussin＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: bpoussin Date: 2010-12-03 16:52:10 +0100 (Fri, 03 Dec 2010) New Revision: 558 Url: http://nuiton.org/repositories/revision/wikitty/558 Log: fix in inMemory implementation to support search on collection field Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2010-12-03 15:52:09 UTC (rev 557) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2010-12-03 15:52:10 UTC (rev 558) @@ -25,6 +25,7 @@ package org.nuiton.wikitty.storage; import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -84,9 +85,22 @@ if (!w.hasField(extName[0], extName[1])) { return false; } + // recupere la valeur dans le wikitty Object o = w.getFqField(fqfieldName); + // recupere le type de la valeur FieldType t = w.getFieldType(fqfieldName); - Object value = t.getValidValue(binOp.getValue()); + // convertie la valeur a verifier dans le meme type que la valeur + // du wikitty + Object value = binOp.getValue(); + if ( !(value instanceof Collection) && t.isCollection()) { + // on doit encapsuler dans une collection, car la creation + // de la requete ajoute autant de v == o && ... que de valeurs + // dans la collection (champs multi-value solr). Mais + // dans le inmemory on doit retrouve des collections et non pas + // des objets seuls :( + value = Collections.singleton(value); + } + value = t.getValidValue(value); boolean checked = false; switch (restriction.getName()) { case EQUALS: Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2010-12-03 15:52:09 UTC (rev 557) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/addons/WikittyLabelUtilTest.java 2010-12-03 15:52:10 UTC (rev 558) @@ -14,19 +14,20 @@ import org.nuiton.wikitty.search.PagedResult; public class WikittyLabelUtilTest { + @Test public void testFindAllByLabel() { - WikittyConfig config = new WikittyConfig(); - WikittyService ws = WikittyServiceFactory.buildWikittyService(config); - WikittyProxy proxy = new WikittyProxy(ws); - WikittyExtension ext = ExtensionFactory.create("test", "1").addField("toto", TYPE.NUMERIC).extension(); - Wikitty w = new WikittyImpl(); - String id = w.getId(); - w.addExtension(ext); - w.setField(ext.getName(), "toto", 42); - proxy.store(w); - WikittyLabelUtil.addLabel(proxy, id, "hello"); - PagedResult<Wikitty> wikitties = WikittyLabelUtil.findAllByLabel(proxy, "hello", 0, 1); - assertEquals(wikitties.get(0), w); + WikittyConfig config = new WikittyConfig(); + WikittyService ws = WikittyServiceFactory.buildWikittyService(config); + WikittyProxy proxy = new WikittyProxy(ws); + WikittyExtension ext = ExtensionFactory.create("test", "1").addField("toto", TYPE.NUMERIC).extension(); + Wikitty w = new WikittyImpl(); + String id = w.getId(); + w.addExtension(ext); + w.setField(ext.getName(), "toto", 42); + proxy.store(w); + WikittyLabelUtil.addLabel(proxy, id, "hello"); + PagedResult<Wikitty> wikitties = WikittyLabelUtil.findAllByLabel(proxy, "hello", 0, 1); + assertEquals(wikitties.get(0), w); } }

1 0

r557 - in trunk: wikitty-dto/src/test/java/org/nuiton/wikitty/dto wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by jcouteau＠users.nuiton.org 03 Dec '10

03 Dec '10

Author: jcouteau Date: 2010-12-03 16:52:09 +0100 (Fri, 03 Dec 2010) New Revision: 557 Url: http://nuiton.org/repositories/revision/wikitty/557 Log: Improve version management in DTO. Unit test not passing. Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-12-03 14:42:18 UTC (rev 556) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2010-12-03 15:52:09 UTC (rev 557) @@ -24,29 +24,38 @@ */ package org.nuiton.wikitty.dto; +import org.junit.Before; import org.junit.Test; -import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyProxy; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelImpl; -import org.nuiton.wikitty.services.WikittyServiceInMemory; public class WikittyDTOTest { static private Log log = LogFactory.getLog(WikittyDTOTest.class); + WikittyProxy proxy; + + @Before + public void clear() throws Exception { + + WikittyConfig config = new WikittyConfig("refcomp-test.properties"); + + WikittyService ws = WikittyServiceFactory.buildWikittyService(config); + ws.clear(null); + proxy = new WikittyProxy(ws); + } + @Test public void testConversions() { - //create proxy as we can only use proxy when dealing with dtos - ApplicationConfig config = new WikittyConfig(); - WikittyServiceInMemory ws = new WikittyServiceInMemory(config); - WikittyProxy proxy = new WikittyProxy(ws); - //create business entity with wikitty WikittyLabel label = new WikittyLabelImpl(); label.addLabels("Test"); @@ -57,24 +66,41 @@ //make conversion WikittyLabel dto = DTOHelper.toDto(label); + //entity=>dto conversion test //check that dto fields are the same than the wikitty ones Assert.assertNotNull(dto); Assert.assertEquals(label.getWikittyId(),dto.getWikittyId()); - Assert.assertEquals(label.getWikittyVersion(),dto.getWikittyVersion()); + Assert.assertTrue(WikittyUtil.versionEquals(label.getWikittyVersion(),dto.getWikittyVersion())); Assert.assertEquals(label.getLabels(), dto.getLabels()); + //First dto=>entity conversion test, no modification + //make conversion to wikitty + WikittyLabel secondLabel = DTOHelper.fromDto(proxy, WikittyLabel.class, dto); + + //check that dto fields are the same than the wikitty ones + Assert.assertNotNull(secondLabel); + Assert.assertEquals(dto.getWikittyId(), secondLabel.getWikittyId()); + Assert.assertEquals(dto.getLabels(), secondLabel.getLabels()); + Assert.assertTrue( + WikittyUtil.versionEquals(secondLabel.getWikittyVersion(), + dto.getWikittyVersion())); + + //Second entity=>dto conversion test, modifications on dto //modify dto dto.addLabels("toto"); - dto.setWikittyVersion("2.0"); //make conversion to wikitty - WikittyLabel secondLabel = DTOHelper.fromDto(proxy,WikittyLabel.class,dto); + WikittyLabel thirdLabel = DTOHelper.fromDto(proxy,WikittyLabel.class,dto); //check that dto fields are the same than the wikitty ones - Assert.assertNotNull(secondLabel); - Assert.assertEquals(dto.getWikittyId(),secondLabel.getWikittyId()); - Assert.assertEquals(dto.getWikittyVersion(), secondLabel.getWikittyVersion()); - Assert.assertEquals(dto.getLabels(), secondLabel.getLabels()); + Assert.assertNotNull(thirdLabel); + Assert.assertEquals(dto.getWikittyId(),thirdLabel.getWikittyId()); + Assert.assertEquals(dto.getLabels(), thirdLabel.getLabels()); + //Check that version have been updated (for storing) + Assert.assertTrue( + WikittyUtil.versionGreaterThan(thirdLabel.getWikittyVersion(), + dto.getWikittyVersion())); + } } \ No newline at end of file Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-03 14:42:18 UTC (rev 556) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2010-12-03 15:52:09 UTC (rev 557) @@ -234,6 +234,7 @@ } else { this.<%=attributeName%>=<%=attributeName%>; } + modificationCount++; }*/; setOperationBody(setter, setterBody); @@ -248,6 +249,7 @@ this.<%=attributeName%> = new <%=attributeTypeInSetImpl%>(); } <%=attributeName%>.add(element); + modificationCount++; }*/; setOperationBody(adder, adderBody); @@ -259,6 +261,7 @@ String removerBody = "" /*{ <%=attributeName%>.remove(element); + modificationCount++; }*/; setOperationBody(remover, removerBody); @@ -269,6 +272,7 @@ String clearBody = "" /*{ <%=attributeName%>.clear(); + modificationCount++; }*/; setOperationBody(clear, clearBody); @@ -301,6 +305,7 @@ setOperationBody(setter, "" /*{ this.<%=attributeName%>=<%=attributeName%>; + modificationCount++; }*/); } @@ -430,6 +435,9 @@ //adding wikittyId attribute addAttribute(dtoClass, "wikittyId", "String"); + //adding modificationCount attribute. Used to change version. + addAttribute(dtoClass, "modificationCount = 0", "int"); + //adding getWikittyId method ObjectModelOperation getter = addOperation(dtoClass, "getWikittyId", "String"); addAnnotation(dtoClass, getter, "Override"); @@ -457,7 +465,8 @@ addAnnotation(dtoClass, getWikittyVersion, "Override"); setOperationBody(getWikittyVersion, "" /*{ - return wikittyVersion; + String result = wikittyVersion + "." + modificationCount; + return result; }*/); //adding setWikittyVersion method @@ -467,6 +476,7 @@ setOperationBody(setWikittyVersion, "" /*{ this.wikittyVersion=wikittyVersion; + modificationCount=0; }*/); //adding necessary imports @@ -567,12 +577,15 @@ } <%=entityName%> sourceCopy = (<%=entityName%>)source; +}*/; + copyFromBody = addCopyFromAttributes(entity, copyFromBody); + + copyFromBody +="" +/*{ setWikittyVersion(sourceCopy.getWikittyVersion()); }*/; - copyFromBody = addCopyFromAttributes(entity, copyFromBody); - addImport(dtoClass, "org.nuiton.wikitty.WikittyException"); addImport(dtoClass, "org.nuiton.wikitty.entities.BusinessEntity");

1 0