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

r366 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 18:16:45 +0200 (Tue, 28 Sep 2010) New Revision: 366 Url: http://nuiton.org/repositories/revision/wikitty/366 Log: Fix creation of new wikitty with already existing wikittyid/version in database (0.x = creation) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-09-28 16:00:45 UTC (rev 365) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-09-28 16:16:45 UTC (rev 366) @@ -83,7 +83,8 @@ newVersion = requestedVersion; } } else { //version in place is not null - if (requestedVersion == null) { //no version requested + if (requestedVersion == null || + requestedVersion.startsWith(WikittyUtil.DEFAULT_MAJOR_VERSION_PREFIX)) { //no version requested newVersion = WikittyUtil.incrementMajorRevision(actualVersion); } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { //same version // wikitty is not modified, do nothing Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-09-28 16:00:45 UTC (rev 365) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-09-28 16:16:45 UTC (rev 366) @@ -50,7 +50,10 @@ */ public class WikittyUtil { - public static final String DEFAULT_VERSION = "0.0"; + public static final String DEFAULT_MAJOR_VERSION = "0"; + public static final String DEFAULT_MINOR_VERSION = "0"; + public static final String DEFAULT_MAJOR_VERSION_PREFIX = DEFAULT_MAJOR_VERSION + "."; + public static final String DEFAULT_VERSION = DEFAULT_MAJOR_VERSION_PREFIX + DEFAULT_MINOR_VERSION; public static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSZ'Z'"; public static final String[] DATE_FORMAT_ALLOWED = { 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-09-28 16:00:45 UTC (rev 365) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-28 16:16:45 UTC (rev 366) @@ -32,11 +32,13 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyObsoleteException; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; -public class StorageTest extends AbstractTestConformance { +public abstract class StorageTest extends AbstractTestConformance { protected final static Log log = LogFactory.getLog(StorageTest.class); @@ -204,7 +206,6 @@ } @Test - // not in StorageTest because InMemory don't support find public void testStoreFindAll() throws Exception { // create some wikitty to permit search test @@ -244,8 +245,12 @@ assertEquals(wikitties.subList(0, 2), wikittyFind); } + /** + * Test ignored because WikittyServiceInMemory don't support facets. + * + * @throws Exception + */ @Test - // not in StorageTest because InMemory don't support find public void testStoreFindAllFacet() throws Exception { // create some wikitty to permit search test @@ -294,7 +299,6 @@ } @Test - // not in StorageTest because InMemory don't support find public void testStoreFindDelete() throws Exception { // create some wikitty to permit search test @@ -358,7 +362,7 @@ // test to find deleted wikitty // test if solr index is coherent with database - Criteria criteria1 = Search.query().eq("id", wikittySource.getId()).criteria(); + Criteria criteria1 = Search.query().eq(Element.ELT_ID, wikittySource.getId()).criteria(); Wikitty searchedWikitty1 = ws.findByCriteria(null, criteria1); Assert.assertNotNull(searchedWikitty1); @@ -368,13 +372,17 @@ // test to find deleted wikitty // test if solr index is coherent with database - Criteria criteria2 = Search.query().eq("id", wikittySource.getId()).criteria(); + Criteria criteria2 = Search.query().eq(Element.ELT_ID, wikittySource.getId()).criteria(); Wikitty searchedWikitty2 = ws.findByCriteria(null, criteria2); Assert.assertNull(searchedWikitty2); } + /** + * Test ignored because WikittyServiceInMemory don't support labels. + * + * @throws Exception + */ @Test - // not in StorageTest because InMemory don't support addLabel public void testStoreAndLabel() throws Exception { // create some wikitty to permit search test @@ -443,7 +451,7 @@ } - private void assign(Wikitty wikitty, TreeNodeImpl root, String path) { + protected void assign(Wikitty wikitty, TreeNodeImpl root, String path) { String[] nodeNames = path.split("/"); TreeNodeImpl currentNode = root; outerloop : for( String nodeName : nodeNames ) { @@ -509,4 +517,72 @@ Assert.assertFalse(labels.isEmpty()); Assert.assertEquals("toto", labels.get(0)); } + + /** + * Test les differents cas du forage de version lors du store. + */ + @Test + public void testStorageVersionForce() { + + // store 1 + Wikitty myWikitty = new WikittyImpl(); + myWikitty.addExtension(TreeNodeImpl.extensions); + myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "name"); + ws.store(null, myWikitty); + Assert.assertEquals("1.0", myWikitty.getVersion()); + + // store 2 : no modification + ws.store(null, myWikitty); + Assert.assertEquals("1.0", myWikitty.getVersion()); + + // store 3 : modification + myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "new name"); + ws.store(null, myWikitty); + Assert.assertEquals("2.0", myWikitty.getVersion()); + + // store 4 : new wikitty with same wikitty id (obsolete) + Wikitty myNewWikitty = new WikittyImpl(myWikitty.getId()); + myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "new wikitty"); + try { + ws.store(null, myNewWikitty); + Assert.fail("Test must throw WikittyObsoleteException"); + } + catch (WikittyObsoleteException ex) { + if (log.isTraceEnabled()) { + log.trace("Wikitty obsolete", ex); + } + } + + // store 4 : same but with force (increased by force) + ws.store(null, Collections.singletonList(myNewWikitty), true); + Assert.assertEquals("3.0", myNewWikitty.getVersion()); + + // store 5 : fix version (not increased by force) + myNewWikitty.setVersion("11.0"); + ws.store(null, Collections.singletonList(myNewWikitty), true); + Assert.assertEquals("11.0", myNewWikitty.getVersion()); + } + + /** + * Test qu'une sauvegarde de wikitty précédemment supprimé fonctionne. + */ + @Test + public void testStoragePreviouslyDeleted() { + + // store 1 + Wikitty myWikitty = new WikittyImpl(); + myWikitty.addExtension(TreeNodeImpl.extensions); + myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "name"); + ws.store(null, myWikitty); + + // delete + ws.delete(null, myWikitty.getId()); + Wikitty restoredWikitty = ws.restore(null, myWikitty.getId()); + Assert.assertNull(restoredWikitty); + + // store again + ws.store(null, myWikitty); + restoredWikitty = ws.restore(null, myWikitty.getId()); + Assert.assertNotNull(restoredWikitty); + } } 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-09-28 16:00:45 UTC (rev 365) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-28 16:16:45 UTC (rev 366) @@ -193,7 +193,8 @@ newVersion = requestedVersion; } } else { //version in place is not null - if (requestedVersion == null) { //no version requested + if (requestedVersion == null || //no version requested + requestedVersion.startsWith(WikittyUtil.DEFAULT_MAJOR_VERSION_PREFIX)) { // or 0.x version forced (creation) newVersion = WikittyUtil.incrementMajorRevision(actualVersion); } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion) && deletionDate == null) { //same version // wikitty is not modified, do nothing

1 0

r365 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bleny＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: bleny Date: 2010-09-28 18:00:45 +0200 (Tue, 28 Sep 2010) New Revision: 365 Url: http://nuiton.org/repositories/revision/wikitty/365 Log: implementations of add|remove|clear FQ field Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-09-28 15:56:00 UTC (rev 364) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-09-28 16:00:45 UTC (rev 365) @@ -128,10 +128,27 @@ void clearField(String ext, String fieldName); + /** + * Add an element in a field + * @param fqFieldName the fully qualified name of a collection field + * @param value the value to be added to the collection + * @since 2.2.0 + */ void addToField(String fqFieldName, Object value); + /** + * Remove an element from a field + * @param fqFieldName the fully qualified name of a collection field + * @param value the value to be removed to the collection + * @since 2.2.0 + */ void removeFromField(String fqFieldName, Object value); + /** + * Clear a field + * @param fqFieldName the fully qualified name of a collection field + * @since 2.2.0 + */ void clearField(String fqFieldName); Set<String> fieldNames(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-09-28 15:56:00 UTC (rev 364) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-09-28 16:00:45 UTC (rev 365) @@ -221,18 +221,27 @@ target.clearField(ext, fieldName); } + /** + * @see org.nuiton.wikitty.Wikitty#addToField(String, Object) + */ @Override public void addToField(String fqFieldName, Object value) { substituteTargetWithCopy(); target.addToField(fqFieldName, value); } + /** + * @see org.nuiton.wikitty.Wikitty#removeFromField(String, Object) + */ @Override public void removeFromField(String fqFieldName, Object value) { substituteTargetWithCopy(); target.removeFromField(fqFieldName, value); } + /** + * @see org.nuiton.wikitty.Wikitty#clearField(String) + */ @Override public void clearField(String fqFieldName) { substituteTargetWithCopy(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-28 15:56:00 UTC (rev 364) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-28 16:00:45 UTC (rev 365) @@ -88,7 +88,7 @@ } public WikittyImpl(String id) { - if(id == null) { + if (id == null) { this.id = WikittyUtil.genUID(); } else { this.id = id; @@ -701,23 +701,32 @@ ext + "." + fieldName), eee); } } - + + /** + * @see org.nuiton.wikitty.Wikitty#addToField(String, Object) + */ @Override public void addToField(String fqFieldName, Object value) { - // TODO 20100928 bleny - throw new UnsupportedOperationException(); + String[] extAndField = fqFieldName.split("\\."); + addToField(extAndField[0], extAndField[1], value); } + /** + * @see org.nuiton.wikitty.Wikitty#removeFromField(String, Object) + */ @Override public void removeFromField(String fqFieldName, Object value) { - // TODO 20100928 bleny - throw new UnsupportedOperationException(); + String[] extAndField = fqFieldName.split("\\."); + removeFromField(extAndField[0], extAndField[1], value); } + /** + * @see org.nuiton.wikitty.Wikitty#clearField(String) + */ @Override public void clearField(String fqFieldName) { - // TODO 20100928 bleny - throw new UnsupportedOperationException(); + String[] extAndField = fqFieldName.split("\\."); + clearField(extAndField[0], extAndField[1]); } @Override

1 0

r364 - in trunk/wikitty-jdbc-impl/src/main: java/org/nuiton/wikitty/jdbc resources
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 17:56:00 +0200 (Tue, 28 Sep 2010) New Revision: 364 Url: http://nuiton.org/repositories/revision/wikitty/364 Log: Fix storing of delete wikitty id 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/WikittyStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 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-09-28 15:55:41 UTC (rev 363) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-09-28 15:56:00 UTC (rev 364) @@ -89,7 +89,9 @@ static final public String QUERY_SELECT_NOTDELETED = "jdbc.queries.select.notdeleted"; /** basic selection with where clause query property name */ static final public String QUERY_SELECT_WHERE = "jdbc.queries.select.where"; - /** not dleeted data selection with where clause query property name */ + /** basic selection with where clause query property name */ + static final public String QUERY_SELECT_TWO_WHERE = "jdbc.queries.select.two.where"; + /** not deleted data selection with where clause query property name */ static final public String QUERY_SELECT_WHERE_NOTDELETED = "jdbc.queries.select.where.notdeleted"; /** wikitty_admin table creation query property name */ 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-09-28 15:55:41 UTC (rev 363) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-28 15:56:00 UTC (rev 364) @@ -36,6 +36,7 @@ import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_INSERT_WIKITTY_DATA; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_NOTDELETED; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_WHERE; +import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_TWO_WHERE; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_WHERE_NOTDELETED; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_UPDATE_WIKITTY_ADMIN; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.TABLE_WIKITTY_ADMIN; @@ -165,8 +166,8 @@ try { UpdateResponse result = new UpdateResponse(); for (Wikitty wikitty : wikitties) { - String query = String.format(conf.getProperty(QUERY_SELECT_WHERE), - COL_VERSION, TABLE_WIKITTY_ADMIN, COL_ID); + String query = String.format(conf.getProperty(QUERY_SELECT_TWO_WHERE), + COL_VERSION, COL_DELETION_DATE, TABLE_WIKITTY_ADMIN, COL_ID); PreparedStatement statement = connection.prepareStatement(query); statement.setString(1, wikitty.getId()); ResultSet versionResultSet = statement.executeQuery(); @@ -174,10 +175,12 @@ String extensionList = ""; boolean wikittyAlreadyExists = versionResultSet.next(); String actualVersion = null; + Date deletionDate = null; String requestedVersion = wikitty.getVersion(); if (wikittyAlreadyExists) { actualVersion = versionResultSet.getString(COL_VERSION); + deletionDate = versionResultSet.getDate(COL_DELETION_DATE); } // compute new version, but not change wikitty @@ -192,7 +195,7 @@ } else { //version in place is not null if (requestedVersion == null) { //no version requested newVersion = WikittyUtil.incrementMajorRevision(actualVersion); - } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { //same version + } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion) && deletionDate == null) { //same version // wikitty is not modified, do nothing continue; } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer @@ -203,7 +206,7 @@ } } } else { - if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { + if (WikittyUtil.versionEquals(actualVersion, requestedVersion) && deletionDate == null) { // wikitty is not modified, do nothing continue; } else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) { @@ -214,15 +217,16 @@ } } - if (!wikittyAlreadyExists) { - // insert wikitty object - String q = conf.getProperty(QUERY_INSERT_WIKITTY_ADMIN); - doQuery(connection, q, wikitty.getId(), newVersion, ""); + if (wikittyAlreadyExists) { + doQuery(connection, conf.getProperty(QUERY_DELETE_WIKITTY_DATA), wikitty.getId()); } + else { + doQuery(connection, conf.getProperty(QUERY_INSERT_WIKITTY_ADMIN), wikitty.getId(), newVersion, ""); + } + + result.addVersionUpdate(wikitty.getId(), newVersion); - doQuery(connection, conf.getProperty(QUERY_DELETE_WIKITTY_DATA), wikitty.getId()); - for (WikittyExtension ext : wikitty.getExtensions()) { extensionList += "," + ext.getId(); for (String fieldName : ext.getFieldNames()) { @@ -270,7 +274,7 @@ // delete first ',' extensionList = extensionList.substring(1); } - + // update extensions in wikitty object String q = conf.getProperty(QUERY_UPDATE_WIKITTY_ADMIN); doQuery(connection, q, newVersion, extensionList, null, wikitty.getId()); Modified: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-09-28 15:55:41 UTC (rev 363) +++ trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-09-28 15:56:00 UTC (rev 364) @@ -44,6 +44,8 @@ jdbc.queries.select.notdeleted=SELECT %s FROM %s WHERE deletionDate IS NULL; #basic selection query with where clause jdbc.queries.select.where=SELECT %s FROM %s WHERE %s = ?; +#basic 2 selections query with where clause +jdbc.queries.select.two.where=SELECT %s, %s FROM %s WHERE %s = ?; #not deleted data selection query with where clause jdbc.queries.select.where.notdeleted=SELECT %s FROM %s WHERE %s = ? AND deletionDate IS NULL;

1 0

r363 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 17:55:41 +0200 (Tue, 28 Sep 2010) New Revision: 363 Url: http://nuiton.org/repositories/revision/wikitty/363 Log: Add parse date tests Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-09-28 15:55:27 UTC (rev 362) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-09-28 15:55:41 UTC (rev 363) @@ -18,6 +18,7 @@ package org.nuiton.wikitty.api; import java.math.BigDecimal; +import java.text.ParseException; import java.util.Date; import java.util.LinkedHashMap; import java.util.List; @@ -473,4 +474,11 @@ Assert.assertEquals(date, dateFormatedAndParsed); } + + @Test + public void testParseDate() throws ParseException { + String date = "1982-01-22T23:00:00.000+0000Z"; + Date date2 = WikittyUtil.parseDate(date); + Assert.assertNotNull(date2); + } }

1 0

r362 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 17:55:27 +0200 (Tue, 28 Sep 2010) New Revision: 362 Url: http://nuiton.org/repositories/revision/wikitty/362 Log: Imporve wikitty in memory service Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-09-28 15:54:22 UTC (rev 361) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-09-28 15:55:27 UTC (rev 362) @@ -63,12 +63,62 @@ protected Map<String, Wikitty> wikitties = new LinkedHashMap<String, Wikitty>(); @Override - public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { UpdateResponse result = new UpdateResponse(); for (Wikitty wikitty : wikitties) { - wikitty.setVersion(WikittyUtil.incrementMajorRevision(wikitty.getVersion())); + + String actualVersion = null; + Wikitty inMemoryWikitty = this.wikitties.get(wikitty.getId()); + if (inMemoryWikitty != null) { + actualVersion = inMemoryWikitty.getVersion(); + } + String requestedVersion = wikitty.getVersion(); + + String newVersion = null; + if (force) { + if (actualVersion == null) { //no version in place + if (requestedVersion == null) { //no version requested + newVersion = WikittyUtil.DEFAULT_VERSION; + } else { //version requested + newVersion = requestedVersion; + } + } else { //version in place is not null + if (requestedVersion == null) { //no version requested + newVersion = WikittyUtil.incrementMajorRevision(actualVersion); + } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { //same version + // wikitty is not modified, do nothing + continue; + } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer + newVersion = requestedVersion; + } else { //requested version is obsolete + throw new WikittyObsoleteException(String.format( + "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); + } + } + } + else { + if (WikittyUtil.versionEquals(actualVersion, requestedVersion)) { + // no modification, continue + continue; + } + else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) { + throw new WikittyObsoleteException(String.format( + "Your wikitty '%s' is obsolete", wikitty.getId())); + } + else { + newVersion = WikittyUtil.incrementMajorRevision(actualVersion); + } + } + wikitty.setVersion(newVersion); wikitty.clearDirty(); - this.wikitties.put(wikitty.getId(), wikitty); + + try { + this.wikitties.put(wikitty.getId(), wikitty.clone()); + } catch (CloneNotSupportedException ex) { + if (log.isErrorEnabled()) { + log.error("Can't clone ?", ex); + } + } result.addVersionUpdate(wikitty.getId(), wikitty.getVersion()); } return result; @@ -243,17 +293,18 @@ public boolean checkRestriction( Restriction restriction, Wikitty w ) { if ( restriction instanceof BinaryOperator ) { BinaryOperator binOp = (BinaryOperator) restriction; - + if ( binOp.getElement().getName().equals(Element.ELT_EXTENSION) ) { return w.hasExtension(binOp.getValue()); } - // FIXME: 20091104 jru manage search on extension and id String fqfieldName = binOp.getElement().getName(); - if(Element.ELT_EXTENSION.equals(fqfieldName) || - Element.ELT_ID.equals(fqfieldName)) { + if(Element.ELT_EXTENSION.equals(fqfieldName)) { return true; } + else if (Element.ELT_ID.equals(fqfieldName)) { + return w.getId().equals(binOp.getValue()); + } // Le check restriction, ne doit pas tester les champs // si les wikitty n'ont meme pas l'extension concerné @@ -264,7 +315,7 @@ Object o = w.getFqField( fqfieldName ); FieldType t = w.getFieldType(fqfieldName); - Object value = t.getValidValue( binOp.getValue() ); + Object value = t.getValidValue(binOp.getValue()); boolean checked = false; switch( restriction.getName() ) { case EQUALS: @@ -329,8 +380,8 @@ Wikitty w = entry.getValue(); String id = entry.getKey(); Restriction dto = criteria.getRestriction(); - - if ( checkRestriction(dto, w) ) { + + if ( !w.isDeleted() && checkRestriction(dto, w) ) { currentIndex++; if (currentIndex > firstIndex) { ids.add(id);

1 0

r361 - trunk/wikitty-api
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 17:54:22 +0200 (Tue, 28 Sep 2010) New Revision: 361 Url: http://nuiton.org/repositories/revision/wikitty/361 Log: Enable conform package tests Modified: trunk/wikitty-api/pom.xml Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-09-28 15:53:29 UTC (rev 360) +++ trunk/wikitty-api/pom.xml 2010-09-28 15:54:22 UTC (rev 361) @@ -177,16 +177,6 @@ </executions> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> -  - <exclude>**/conform/*.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> </build>

1 0

r360 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 17:53:29 +0200 (Tue, 28 Sep 2010) New Revision: 360 Url: http://nuiton.org/repositories/revision/wikitty/360 Log: Fix test dates (solr format) Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-09-28 14:52:28 UTC (rev 359) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-09-28 15:53:29 UTC (rev 360) @@ -114,17 +114,17 @@ " <object id='f4ef949b-09e4-438f-b359-2a4332771c81' version='1.0' extensions='wikittyExt[1.0]'>" + " <wikittyExt.fieldName0>table</wikittyExt.fieldName0>" + " <wikittyExt.fieldName1>3300</wikittyExt.fieldName1>" + - " <wikittyExt.fieldName2>1982-01-22T23:00:00.000Z</wikittyExt.fieldName2>" + + " <wikittyExt.fieldName2>1982-01-22T23:00:00.000+0000Z</wikittyExt.fieldName2>" + " </object>" + " <object id='7ca86742-5957-4659-b12f-4915cbef9193' version='1.0' extensions='wikittyExt[1.0]'>" + " <wikittyExt.fieldName0>chaise</wikittyExt.fieldName0>" + " <wikittyExt.fieldName1>113311</wikittyExt.fieldName1>" + - " <wikittyExt.fieldName2>2009-09-25T22:00:00.000Z</wikittyExt.fieldName2>" + + " <wikittyExt.fieldName2>2009-09-25T22:00:00.000+0000Z</wikittyExt.fieldName2>" + " </object>" + " <object id='77d7640c-573d-421c-a7e9-9b70bd025983' version='1.0' extensions='wikittyExt[1.0]'>" + " <wikittyExt.fieldName0>bureau</wikittyExt.fieldName0>" + " <wikittyExt.fieldName1>223322</wikittyExt.fieldName1>" + - " <wikittyExt.fieldName2>2029-12-24T23:00:00.000Z</wikittyExt.fieldName2>" + + " <wikittyExt.fieldName2>2029-12-24T23:00:00.000+0000Z</wikittyExt.fieldName2>" + " </object>" + "</wikengo>";

1 0

r359 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/xmi wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: bleny Date: 2010-09-28 16:52:28 +0200 (Tue, 28 Sep 2010) New Revision: 359 Url: http://nuiton.org/repositories/revision/wikitty/359 Log: add meta-extension support in transformers, add meta stereotype in model, some modifications in Wikitty contract Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java trunk/wikitty-api/src/main/xmi/wikitty.zargo trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-09-28 14:43:15 UTC (rev 358) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-09-28 14:52:28 UTC (rev 359) @@ -128,6 +128,12 @@ void clearField(String ext, String fieldName); + void addToField(String fqFieldName, Object value); + + void removeFromField(String fqFieldName, Object value); + + void clearField(String fqFieldName); + Set<String> fieldNames(); Object getFqField(String fqFieldName); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-09-28 14:43:15 UTC (rev 358) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-09-28 14:52:28 UTC (rev 359) @@ -221,6 +221,24 @@ target.clearField(ext, fieldName); } + @Override + public void addToField(String fqFieldName, Object value) { + substituteTargetWithCopy(); + target.addToField(fqFieldName, value); + } + + @Override + public void removeFromField(String fqFieldName, Object value) { + substituteTargetWithCopy(); + target.removeFromField(fqFieldName, value); + } + + @Override + public void clearField(String fqFieldName) { + substituteTargetWithCopy(); + target.clearField(fqFieldName); + } + public Set<String> fieldNames() { return target.fieldNames(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-28 14:43:15 UTC (rev 358) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-09-28 14:52:28 UTC (rev 359) @@ -703,6 +703,24 @@ } @Override + public void addToField(String fqFieldName, Object value) { + // TODO 20100928 bleny + throw new UnsupportedOperationException(); + } + + @Override + public void removeFromField(String fqFieldName, Object value) { + // TODO 20100928 bleny + throw new UnsupportedOperationException(); + } + + @Override + public void clearField(String fqFieldName) { + // TODO 20100928 bleny + throw new UnsupportedOperationException(); + } + + @Override public boolean equals(Object obj) { boolean result = false; if (obj instanceof Wikitty) { Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo =================================================================== (Binary files differ) 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-09-28 14:43:15 UTC (rev 358) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-09-28 14:52:28 UTC (rev 359) @@ -41,7 +41,9 @@ */ protected Pattern p = Pattern.compile("\\{(([^|}])*)(?:\\|([^}]*))?\\}"); - /** map "Client.name" to "getName()" or any getter to read this attribute */ + /** map "Client.name" to "getName()" or any getter to read this attribute + * those getter names are stored while generating in order to be found + * later when generating toString() */ protected Map<String, String> attributeToGetterName = new HashMap<String, String>(); @Override @@ -51,50 +53,53 @@ @Override public void transformFromModel(ObjectModel model) { - - List<ObjectModelClass> modelBusinessEntities = new ArrayList<ObjectModelClass>(); + // contains boths businessEntities and metaExtensions + // elements may have one of the two sterotypes or both + // but elements with none of them aren't in this list + List<ObjectModelClass> modelBoth = new ArrayList<ObjectModelClass>(); + // fill modelBusinessEntities with entities found in model for (ObjectModelClass clazz : model.getClasses()) { - if (WikittyTransformerUtil.isBusinessEntity(clazz)) { - modelBusinessEntities.add(clazz); + if (WikittyTransformerUtil.isBusinessEntity(clazz) || + WikittyTransformerUtil.isMetaExtension(clazz)) { + modelBoth.add(clazz); } } - for (ObjectModelClass businessEntity : modelBusinessEntities) { - ObjectModelClass abstractClass = createAbstractClass(WikittyTransformerUtil.businessEntityToAbstractName(businessEntity), - businessEntity.getPackageName()); - processedClasses.put(businessEntity, abstractClass); + for (ObjectModelClass clazz : modelBoth) { + ObjectModelClass abstractClass = createAbstractClass( + WikittyTransformerUtil.businessEntityToAbstractName(clazz), + clazz.getPackageName()); + processedClasses.put(clazz, abstractClass); setSuperClass(abstractClass, "BusinessEntityWikitty"); - addInterface(abstractClass, businessEntity.getQualifiedName()); + addInterface(abstractClass, clazz.getQualifiedName()); } - - for (ObjectModelClass businessEntity : modelBusinessEntities) { - addOperations(businessEntity, processedClasses.get(businessEntity)); + + for (ObjectModelClass clazz : modelBoth) { + if (WikittyTransformerUtil.isMetaExtension(clazz)) { + addMetaExtensionOperations(clazz, processedClasses.get(clazz)); + } else if (WikittyTransformerUtil.isBusinessEntity(clazz)) { + addOperations(clazz, processedClasses.get(clazz)); + } } // at this time, all operations in generated abstracts are just the operations // like get/set etc. we will copy all operations of a given class to all children // that's why constructors and others operations are not yet added - for (ObjectModelClass businessEntity : modelBusinessEntities) { - addInheritedOperations(businessEntity, processedClasses.get(businessEntity)); + for (ObjectModelClass clazz : modelBoth) { + if (WikittyTransformerUtil.isBusinessEntity(clazz)) { + addInheritedOperations(clazz, processedClasses.get(clazz)); + } } - for (ObjectModelClass businessEntity : modelBusinessEntities) { - ObjectModelClass abstractClassForThisEntity = processedClasses.get(businessEntity); + for (ObjectModelClass clazz : modelBoth) { + ObjectModelClass abstractClassForThisEntity = processedClasses.get(clazz); addImports(abstractClassForThisEntity); addConstructors(abstractClassForThisEntity); - addConstants(businessEntity, abstractClassForThisEntity); - addToString(businessEntity, abstractClassForThisEntity); + addConstants(clazz, abstractClassForThisEntity); + addToString(clazz, abstractClassForThisEntity); } - - // for all classes of model, check if steroptyped with "meta" - for (ObjectModelClass clazz : model.getClasses()) { - if (WikittyTransformerUtil.isMetaExtension(clazz)) { - // if so, add operations - addMetaExtensionOperations(clazz, processedClasses.get(clazz)); - } - } processedClasses.clear(); } @@ -258,9 +263,6 @@ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true); String helperClassName = WikittyTransformerUtil.businessEntityToHelperName(businessEntity); - boolean isMetaExtension = WikittyTransformerUtil.isMetaExtension(businessEntity); - - // generating operations with bodies to realize contract for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { if (attribute.isNavigable()) { @@ -287,53 +289,24 @@ getterName = "get" + StringUtils.capitalize(attributeName); ObjectModelOperation getter = addOperation(abstractClass, getterName, attributeTypeSimpleNameInSet); addAnnotation(abstractClass, getter, "Override"); - String getterBody; - if (isMetaExtension) { - getterBody = "" + String getterBody = "" /*{ - <%=attributeTypeSimpleNameInSet%> result; - if (extensionForMetaExtension == null) { - result = <%=helperClassName%>.<%=getterName%>(getWikitty()); - } else { - result = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension, getWikitty()); - } - return result; -}*/; - } else { - getterBody = "" -/*{ <%=attributeTypeSimpleNameInSet%> result = <%=helperClassName%>.<%=getterName%>(getWikitty()); return result; -}*/; - } +}*/; setOperationBody(getter, getterBody); String addName = "add" + StringUtils.capitalize(attributeName); ObjectModelOperation adder = addOperation(abstractClass, addName, "void"); addAnnotation(abstractClass, adder, "Override"); addParameter(adder, "String", "element"); - String adderBody; - if (isMetaExtension) { - adderBody = "" + String adderBody = "" /*{ - if (extensionForMetaExtension == null) { - <%=helperClassName%>.<%=addName%>(getWikitty(), element); - getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%= getter.getName() %>()); - } else { - <%=helperClassName%>.<%=addName%>(extensionForMetaExtension, getWikitty(), element); - String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); - getPropertyChangeSupport().firePropertyChange(fieldName, null, <%= getter.getName() %>()); - } -}*/; - } else { - adderBody = "" -/*{ <%=helperClassName%>.<%=addName%>(getWikitty(), element); getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%= getter.getName() %>()); }*/; - } setOperationBody(adder, adderBody); - + String removeName = "remove" + StringUtils.capitalize(attributeName); ObjectModelOperation remover = addOperation(abstractClass, removeName, "void"); addAnnotation(abstractClass, remover, "Override"); @@ -344,7 +317,7 @@ getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); }*/; setOperationBody(remover, removerBody); - + String clearName = "clear" + StringUtils.capitalize(attributeName); ObjectModelOperation clear = addOperation(abstractClass, clearName, "void"); addAnnotation(abstractClass, clear, "Override"); @@ -354,8 +327,7 @@ getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); }*/; setOperationBody(clear, clearBody); - - + } else { String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); @@ -478,6 +450,8 @@ protected void addMetaExtensionOperations(ObjectModelClass metaExtension, ObjectModelClass abstractClassForThisMetaExtension) { + String helperClassName = WikittyTransformerUtil.businessEntityToHelperName(metaExtension); + ObjectModelAttribute extension = addAttribute(abstractClassForThisMetaExtension, "extensionForMetaExtension", WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN); setDocumentation(extension, "the metaExtension operations target this extension, may be null"); @@ -487,11 +461,138 @@ setDocumentation(addMetaExtension, String.format( "add %s meta-extension on given extension to this entity", metaExtension.getName())); - String helperName = WikittyTransformerUtil.businessEntityToHelperName(metaExtension); setOperationBody(addMetaExtension, "" /*{ extensionForMetaExtension = extension; - <%=helperName%>.addMetaExtension(extension, getWikitty()); + <%=helperClassName%>.addMetaExtension(extension, getWikitty()); }*/); + + // generating operations with bodies to realize contract + for (ObjectModelAttribute attribute : metaExtension.getAttributes()) { + if (attribute.isNavigable()) { + // needed below, in templates + String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); + String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); + + String attributeName = attribute.getName(); + if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { + // there is a conflict, purifier transformer give as the right name to use + attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + } + + String getterName = null; + + if (WikittyTransformerUtil.isAttributeCollection(attribute)) { + // attributed is a collection, we will generate operations get, add, remove and clear + + String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true); + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // now, for this attribute, we will generate add, remove and clear methods + // adding operations to contract + getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(abstractClassForThisMetaExtension, getterName, attributeTypeSimpleNameInSet); + addAnnotation(abstractClassForThisMetaExtension, getter, "Override"); + String getterBody = "" +/*{ + <%=attributeTypeSimpleNameInSet%> result; + if (extensionForMetaExtension == null) { + result = <%=helperClassName%>.<%=getterName%>(getWikitty()); + } else { + result = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension, getWikitty()); + } + return result; +}*/; + setOperationBody(getter, getterBody); + + String addName = "add" + StringUtils.capitalize(attributeName); + ObjectModelOperation adder = addOperation(abstractClassForThisMetaExtension, addName, "void"); + addAnnotation(abstractClassForThisMetaExtension, adder, "Override"); + addParameter(adder, "String", "element"); + String adderBody = "" +/*{ + if (extensionForMetaExtension == null) { + <%=helperClassName%>.<%=addName%>(getWikitty(), element); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); + } else { + <%=helperClassName%>.<%=addName%>(extensionForMetaExtension, getWikitty(), element); + String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); + getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); + } +}*/; + setOperationBody(adder, adderBody); + + String removeName = "remove" + StringUtils.capitalize(attributeName); + ObjectModelOperation remover = addOperation(abstractClassForThisMetaExtension, removeName, "void"); + addAnnotation(abstractClassForThisMetaExtension, remover, "Override"); + addParameter(remover, "String", "element"); + String removerBody = "" +/*{ + if (extensionForMetaExtension == null) { + <%=helperClassName%>.<%=removeName%>(getWikitty(), element); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); + } else { + <%=helperClassName%>.<%=removeName%>(extensionForMetaExtension, getWikitty(), element); + String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); + getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); + } +}*/; + setOperationBody(remover, removerBody); + + String clearName = "clear" + StringUtils.capitalize(attributeName); + ObjectModelOperation clear = addOperation(abstractClassForThisMetaExtension, clearName, "void"); + addAnnotation(abstractClassForThisMetaExtension, clear, "Override"); + String clearBody = "" +/*{ + if (extensionForMetaExtension == null) { + <%=helperClassName%>.<%=clearName%>(getWikitty()); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); + } else { + <%=helperClassName%>.<%=clearName%>(extensionForMetaExtension, getWikitty()); + String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); + getPropertyChangeSupport().firePropertyChange(fieldName, null, <%=getter.getName()%>()); + } +}*/; + setOperationBody(clear, clearBody); + + + } else { + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // adding getter and setter to contract + getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(abstractClassForThisMetaExtension, getterName, attributeType); + addAnnotation(abstractClassForThisMetaExtension, getter, "Override"); + setOperationBody(getter, "" +/*{ + <%=attributeType%> value; + if (extensionForMetaExtension == null) { + value = <%=helperClassName%>.<%=getterName%>(getWikitty()); + } else { + value = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension, getWikitty()); + } + return value; +}*/); + + String setterName = "set" + StringUtils.capitalize(attributeName); + ObjectModelOperation setter = addOperation(abstractClassForThisMetaExtension, setterName, attributeType); + addAnnotation(abstractClassForThisMetaExtension, setter, "Override"); + addParameter(setter, attributeType, attributeName); + setOperationBody(setter, "" +/*{ + <%=attributeType%> oldValue; + if (extensionForMetaExtension == null) { + oldValue = <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=getter.getName()%>()); + } else { + oldValue = <%=helperClassName%>.<%=setterName%>(extensionForMetaExtension, getWikitty(), <%=attributeName%>); + String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); + getPropertyChangeSupport().firePropertyChange(fieldName, oldValue, <%=getter.getName()%>()); + } + return oldValue; +}*/); + } + } + } } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-28 14:43:15 UTC (rev 358) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-28 14:52:28 UTC (rev 359) @@ -263,6 +263,106 @@ - // now, adding all + // now, adding all + + // generating operations with bodies + for (ObjectModelAttribute attribute : metaExtension.getAttributes()) { + if (attribute.isNavigable()) { + // needed below, in templates + String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); + String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); + + String attributeName = attribute.getName(); + if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { + // there is a conflict, purifier transformer give as the right name to use + attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + } + + if (WikittyTransformerUtil.isAttributeCollection(attribute)) { + // attributed is a collection, we will generate operations get, add, remove and clear + + String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true); + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // now, for this attribute, we will generate add, remove and clear methods + // adding operations to contract + String getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet, ObjectModelModifier.STATIC); + addParameter(getter, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(getter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + String getterBody = "" +/*{ + String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + <%=attributeTypeSimpleNameInSet%> result = (<%=attributeTypeSimpleNameInSet%>) wikitty.getFqField(fieldName); + return result; +}*/; + setOperationBody(getter, getterBody); + + String addName = "add" + StringUtils.capitalize(attributeName); + ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC); + addParameter(adder, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(adder, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + addParameter(adder, attributeType, "element"); + String adderBody = "" +/*{ + String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + wikitty.addToField(fieldName, element); +}*/; + setOperationBody(adder, adderBody); + + String removeName = "remove" + StringUtils.capitalize(attributeName); + ObjectModelOperation remover = addOperation(helper, removeName, "void", ObjectModelModifier.STATIC); + addParameter(remover, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(remover, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + addParameter(remover, attributeType, "element"); + String removerBody = "" +/*{ + String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + wikitty.removeFromField(fieldName, element); +}*/; + setOperationBody(remover, removerBody); + + String clearName = "clear" + StringUtils.capitalize(attributeName); + ObjectModelOperation clear = addOperation(helper, clearName, "void", ObjectModelModifier.STATIC); + addParameter(clear, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(clear, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + String clearBody = "" +/*{ + String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + wikitty.clearField(fieldName); +}*/; + setOperationBody(clear, clearBody); + + + } else { + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // adding getter and setter to contract + String getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(helper, getterName, attributeType, ObjectModelModifier.STATIC); + addParameter(getter, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(getter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setOperationBody(getter, "" +/*{ + String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + <%=attributeType%> value = (<%=attributeType%>) wikitty.getFqField(fieldName); + return value; +}*/); + + String setterName = "set" + StringUtils.capitalize(attributeName); + ObjectModelOperation setter = addOperation(helper, setterName, attributeType, ObjectModelModifier.STATIC); + addParameter(setter, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(setter, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + addParameter(setter, attributeType, attributeName); + setOperationBody(setter, "" +/*{ + <%=attributeType%> oldValue = <%=getter.getName()%>(extension, wikitty); + String fieldName = getMetaFieldName(extension, "<%=attributeName%>"); + wikitty.setFqField(fieldName, <%=attributeName%>); + return oldValue; +}*/); + } + } + } } }

1 0

r358 - trunk
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 16:43:15 +0200 (Tue, 28 Sep 2010) New Revision: 358 Url: http://nuiton.org/repositories/revision/wikitty/358 Log: Update h2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-28 13:44:36 UTC (rev 357) +++ trunk/pom.xml 2010-09-28 14:43:15 UTC (rev 358) @@ -90,7 +90,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.142</version> + <version>1.2.143</version> <scope>test</scope> </dependency>

1 0

r357 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org Sept. 28, 2010

Sept. 28, 2010

Author: echatellier Date: 2010-09-28 15:44:36 +0200 (Tue, 28 Sep 2010) New Revision: 357 Url: http://nuiton.org/repositories/revision/wikitty/357 Log: Throw direct WikittyException when cause is WikittyException Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-28 12:45:38 UTC (rev 356) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-28 13:44:36 UTC (rev 357) @@ -189,7 +189,7 @@ transaction.commit(); return result; - } catch (WikittyObsoleteException ex) { + } catch (WikittyException ex) { transaction.rollback(); throw ex; } catch (Exception eee) { @@ -217,7 +217,7 @@ transaction.commit(); return result; - } catch (WikittyObsoleteException ex) { + } catch (WikittyException ex) { transaction.rollback(); throw ex; } catch (Exception eee) { @@ -245,7 +245,7 @@ transaction.commit(); return result; - } catch (WikittyObsoleteException ex) { + } catch (WikittyException ex) { transaction.rollback(); throw ex; } catch (Exception eee) {

1 0