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

r1580 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 26 Sep '13

26 Sep '13

Author: bpoussin Date: 2013-09-26 20:19:21 +0200 (Thu, 26 Sep 2013) New Revision: 1580 Url: http://nuiton.org/projects/wikitty/repository/revisions/1580 Log: fixe potentiel null pointer Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2013-09-24 09:47:31 UTC (rev 1579) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2013-09-26 18:19:21 UTC (rev 1580) @@ -1883,7 +1883,10 @@ */ public <E, F> WikittyQueryResult<Map<String, E>> castToMap(Class<E> target, WikittyQueryResult<Map<String, F>> queryResult) { - WikittyQueryResult<Map<String, E>> result = queryResult.castToMap(this, target); + WikittyQueryResult<Map<String, E>> result = null; + if (queryResult != null) { + result = queryResult.castToMap(this, target); + } return result; }

1 0

[ANN] - Wikitty 3.10 released
by nuiton.org Release Notification 24 Sep '13

24 Sep '13

The Wikitty team is pleased to announce the wikitty-3.10 release! Wikitty multi-module project Documentation of the project can be found here: http://maven-site.nuiton.org/wikitty Changes ------- Changes in this version include: New features: o add new select function to get year of date Issue: 2754. Thanks to Benjamin Poussin. Resolved by bpoussin. o Change upgrade data process Issue: 2854. Thanks to Benjamin Poussin. Resolved by bpoussin. o Add new method to WikittyClient and BusinessHelper to remove extension easily Issue: 2855. Thanks to Benjamin Poussin. Resolved by bpoussin. o migrate to solr 4.1 and cleaning solrconfig.xml Issue: 2561. Thanks to Benjamin Poussin. Resolved by bpoussin. o Change select implementation to do only one solr request Issue: 1996. Thanks to Benjamin Poussin. Resolved by bpoussin. o Add support of new method in query language Issue: 2396. Thanks to Benjamin Poussin. Resolved by bpoussin. o Improve WikittyQueryResult, result must have wikitty id and select result in same time Issue: 2544. Thanks to Benjamin Poussin. Resolved by bpoussin. o Update to solr and lucene 4.0 Issue: 1761. Thanks to Éric Chatellier. Resolved by jcouteau. o Support relative date for String date representation Issue: 2620. Thanks to Benjamin Poussin. Resolved by bpoussin. Fixed Bugs: o When wikitty open multiple solr server on same data file, solr index is corrupted Issue: 2753. Thanks to Benjamin Poussin. Resolved by bpoussin. Downloads --------- For a manual installation, you can download files here: http://nuiton.org/projects/wikitty/files * wikitty-hessian-server-3.10.war - http://nuiton.org/attachments/download/966 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wikitty team

1 0

r1579 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 24 Sep '13

24 Sep '13

Author: maven-release Date: 2013-09-24 11:47:31 +0200 (Tue, 24 Sep 2013) New Revision: 1579 Url: http://nuiton.org/projects/wikitty/repository/revisions/1579 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> <modules> @@ -789,10 +789,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.10</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.10 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.10</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm> <distributionManagement> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-api/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-dto/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-generators/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-hessian-client/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-hessian-server/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-jdbc/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-perf-test/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-solr/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2013-09-24 09:47:26 UTC (rev 1578) +++ trunk/wikitty-struts/pom.xml 2013-09-24 09:47:31 UTC (rev 1579) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10</version> + <version>3.11-SNAPSHOT</version> </parent>

1 0

r1578 - in tags: . wikitty-3.10
by maven-release＠users.nuiton.org 24 Sep '13

24 Sep '13

Author: maven-release Date: 2013-09-24 11:47:26 +0200 (Tue, 24 Sep 2013) New Revision: 1578 Url: http://nuiton.org/projects/wikitty/repository/revisions/1578 Log: [maven-release-plugin] copy for tag wikitty-3.10 Added: tags/wikitty-3.10/ Property changes on: tags/wikitty-3.10 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r1577 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 24 Sep '13

24 Sep '13

Author: maven-release Date: 2013-09-24 11:47:23 +0200 (Tue, 24 Sep 2013) New Revision: 1577 Url: http://nuiton.org/projects/wikitty/repository/revisions/1577 Log: [maven-release-plugin] prepare release wikitty-3.10 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> <modules> @@ -789,10 +789,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.10</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.10 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.10</url> </scm> <distributionManagement> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-api/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-dto/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-generators/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-hessian-client/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-hessian-server/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-jdbc/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-perf-test/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-solr/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent>  Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2013-09-24 09:32:14 UTC (rev 1576) +++ trunk/wikitty-struts/pom.xml 2013-09-24 09:47:23 UTC (rev 1577) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.10</version> </parent>

1 0

r1576 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 24 Sep '13

24 Sep '13

Author: bpoussin Date: 2013-09-24 11:32:14 +0200 (Tue, 24 Sep 2013) New Revision: 1576 Url: http://nuiton.org/projects/wikitty/repository/revisions/1576 Log: add header Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java 2013-09-23 15:02:45 UTC (rev 1575) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/DateMathParser.java 2013-09-24 09:32:14 UTC (rev 1576) @@ -17,6 +17,30 @@ package org.nuiton.wikitty; +/* + * #%L + * Wikitty :: api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * 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% + */ + import java.util.Date; import java.util.Calendar; import java.util.TimeZone; Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java 2013-09-23 15:02:45 UTC (rev 1575) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrQueryTest.java 2013-09-24 09:32:14 UTC (rev 1576) @@ -1,6 +1,30 @@ package org.nuiton.wikitty.storage.solr; +/* + * #%L + * Wikitty :: wikitty-solr + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 CodeLutin + * %% + * 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% + */ + import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r1575 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/entities wikitty-api/src/test/java/org/nuiton/wikitty wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 23 Sep '13

23 Sep '13

Author: bpoussin Date: 2013-09-23 17:02:45 +0200 (Mon, 23 Sep 2013) New Revision: 1575 Url: http://nuiton.org/projects/wikitty/repository/revisions/1575 Log: fixes #2855: Add new method to WikittyClient and BusinessHelper to remove extension easily Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -1590,6 +1590,70 @@ } + /** + * Supprime les extensions specifique de l'objet metier passe en argument. + * L'objet ne peut donc plus etre du type passer en arguement, un wikitty + * generique est donc retourne (le wikitty est celui qui etait en interne + * de la classe metier). + * + * Le wikitty retourne doit etre sauve pour que la modification soit reelle + * + * @param e une entity dont on veut supprimer l'extension porter par le type + * metier + * @return un wikitty + * @since 3.10 + */ + public Wikitty removeExtension(BusinessEntity e) { + Wikitty result = castTo(Wikitty.class, e); + result.removeExtensions(e.getStaticExtensionNames()); + return result; + } + + /** + * Supprime les extensions specifique des objets metier passes en argument. + * L'objet ne peut donc plus etre du type passer en arguement, un wikitty + * generique est donc retourne (le wikitty est celui qui etait en interne + * de la classe metier). + * + * Le wikitty retourne doit etre sauve pour que la modification soit reelle + * + * @param e liste d'entity dont on veut supprimer l'extension porter par le type + * metier + * @return un liste de wikitty + * @since 3.10 + */ + public List<Wikitty> removeExtension(Collection<BusinessEntity> e) { + List<Wikitty> result = null; + if (e != null) { + result = new ArrayList<Wikitty>(e.size()); + for (BusinessEntity b : e) { + result.add(removeExtension(b)); + } + } + return result; + } + + /** + * Supprime les extensions specifique des objets metier passes en argument. + * L'objet ne peut donc plus etre du type passer en arguement, un wikitty + * generique est donc retourne (le wikitty est celui qui etait en interne + * de la classe metier). + * + * Le wikitty retourne doit etre sauve pour que la modification soit reelle + * + * @param e une ou plusieurs entity dont on veut supprimer l'extension porter par le type + * metier + * @return un tableau de wikitty + * @since 3.10 + */ + public Wikitty[] removeExtension(BusinessEntity ... e) { + Wikitty[] result = new Wikitty[e.length]; + for (int i=0; i<e.length; i++) { + result[i] = removeExtension(e[i]); + } + return result; + } + public void deleteExtension(String extName) { long start = TimeLog.getTime(); wikittyService.deleteExtension(securityToken, extName); 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 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -65,6 +65,14 @@ public void setWikittyVersion(String version); /** + * Return list of all extension name that this entity has by definition + * (design time) and not extension added during execution time + * @return static extension name + * @since 3.10 + */ + public Collection<String> getStaticExtensionNames(); + + /** * Return list of all extension for this object. * * @return extension names Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -29,6 +29,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -168,6 +169,15 @@ } @Override + public Collection<String> getStaticExtensionNames() { + ArrayList<String> result = new ArrayList<String>(); + for (WikittyExtension ext : getStaticExtensions()) { + result.add(ext.getName()); + } + return result; + } + + @Override public boolean equals(Object obj) { if (obj == null) { return false; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -194,13 +194,23 @@ * Remove extension in argument and all dependants extensions. * Fields of extension is removed too. * If extension in argument is not found, nothing is done - * + * * @param ext extension to remove * @since 3.9 */ void removeExtension(String ext); /** + * Remove extension in argument and all dependants extensions. + * Fields of extension is removed too. + * If extension in argument is not found, nothing is done + * + * @param exts extensions to remove + * @since 3.10 + */ + void removeExtensions(Collection<String> exts); + + /** * Check that the wikitty has a metaExtension about a given extension. * * @param metaExtensionName the metaExtension to be checked 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 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -250,6 +251,7 @@ } } + @Override public void removeExtension(String ext) { if (target.getExtensionNames().contains(ext)) { substituteTargetWithCopy(); @@ -258,6 +260,14 @@ } @Override + public void removeExtensions(Collection<String> ext) { + if (CollectionUtils.containsAny(target.getExtensionNames(), ext)) { + substituteTargetWithCopy(); + target.removeExtensions(ext); + } + } + + @Override public boolean hasExtension(String extName) { return target.hasExtension(extName); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -415,6 +415,7 @@ } } + @Override public void removeExtension(String ext) { Collection<WikittyExtension> exts = getExtensionDependencies(ext, true); exts.add(extensions.get(ext)); @@ -427,6 +428,13 @@ } } + @Override + public void removeExtensions(Collection<String> exts) { + for (String e : exts) { + removeExtension(e); + } + } + /** * @see Wikitty#hasMetaExtension(String, String) */ Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -866,6 +866,11 @@ } @Override + public Collection<String> getStaticExtensionNames() { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override public Collection<String> getExtensionNames() { throw new UnsupportedOperationException("Not supported yet."); } 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 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -706,6 +706,15 @@ throw new UnsupportedOperationException("Not supported yet."); }*/); + //adding getStaticExtension method + ObjectModelOperation getStaticExtensionNames = addOperation(dtoClass, + "getStaticExtensionNames", "Collection<String>"); + addAnnotation(dtoClass, getStaticExtensionNames, "Override"); + setOperationBody(getStaticExtensionNames, "" +/*{ + throw new UnsupportedOperationException("Not supported yet."); +}*/); + //adding getField method ObjectModelOperation getField = addOperation(dtoClass, "getField", "Object"); addAnnotation(dtoClass, getField, "Override"); 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 2013-09-23 13:32:53 UTC (rev 1574) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2013-09-23 15:02:45 UTC (rev 1575) @@ -475,6 +475,17 @@ } }*/); + + ObjectModelOperation removeExtension = addOperation(helper, "removeExtension", "void", ObjectModelModifier.STATIC); + addParameter(removeExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setDocumentation(removeExtension, "supprime les extensions de cette classe au wikitty en argument"); + setOperationBody(removeExtension, "" +/*{ + for (WikittyExtension ext : <%=contractName%>.extensions) { + wikitty.removeExtension(ext.getName()); + } +}*/); + ObjectModelOperation toString = addOperation(helper, "toString", "String", ObjectModelModifier.STATIC); addParameter(toString, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); setDocumentation(toString,

1 0

r1574 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty/services test/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 23 Sep '13

23 Sep '13

Author: bpoussin Date: 2013-09-23 15:32:53 +0200 (Mon, 23 Sep 2013) New Revision: 1574 Url: http://nuiton.org/projects/wikitty/repository/revisions/1574 Log: fixes #2854: Change upgrade data process Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java 2013-08-09 09:04:14 UTC (rev 1573) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigration.java 2013-09-23 13:32:53 UTC (rev 1574) @@ -58,14 +58,16 @@ * Migrate wikitty data from oldExt version to newExt. * * @param service Wikitty service that do migration - * @param wikitty Wikitty object that contains data in old version + * @param oldWikitty Wikitty object that contains data in old version * extension format + * @param newWikitty Wikitty object that contains data in new version + * extension format after call * @param oldExt old extension definition * @param newExt new extension definition - * @return same wikitty as argument if nothing to do, or new wikitty - * if some modification is done + * @return newWikitty argument */ - public Wikitty migrate(WikittyService service, Wikitty wikitty, + public Wikitty migrate(WikittyService service, + Wikitty oldWikitty, Wikitty newWikitty, WikittyExtension oldExt, WikittyExtension newExt); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2013-08-09 09:04:14 UTC (rev 1573) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2013-09-23 13:32:53 UTC (rev 1574) @@ -27,10 +27,7 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.WikittyImpl; import java.util.Collection; -import java.util.List; -import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -42,8 +39,6 @@ * rename, not creation a new field, you should use tag value "renameFrom" with * name of use in before extension. * - * Since 1.5, this class also take care about extension order. - * * @author ruchaud */ public class WikittyExtensionMigrationRename implements WikittyExtensionMigration { @@ -52,67 +47,12 @@ public static final String TAG_RENAME = "renameFrom"; - /** - * Recursively add extension with requires ones (orderer). - * WikittyService used in this method must not have WikittyServiceAuthorisation - * in stack because we pass null as secuirtyToken to method. (TODO poussin - * 2010 verify this assertion, when we use Migration, we don't need - * Security) - * - * @param service service - * @param wikitty wikitty to add extension to - * @param newExt extension to add - */ - protected void addExtension( - WikittyService service, Wikitty wikitty, WikittyExtension newExt) { - - // manage requires before current - List<String> requires = newExt.getRequires(); - if (requires != null && !requires.isEmpty()) { - for (String require : requires) { - WikittyExtension newRequireExt = - service.restoreExtensionLastVersion(null, require); - addExtension(service, wikitty, newRequireExt); - } - } - - // add current extension - wikitty.addExtension(newExt); - } - @Override - public Wikitty migrate(WikittyService service, Wikitty wikitty, + public Wikitty migrate(WikittyService service, + Wikitty oldWikitty, Wikitty newWikitty, WikittyExtension oldExt, WikittyExtension newExt) { - String wikittyId = wikitty.getWikittyId(); - String wikittyVersion = wikitty.getWikittyVersion(); - - Wikitty result = new WikittyImpl(wikittyId); - result.setWikittyVersion(wikittyVersion); - - // Add all extension and replaceWith old by the new - for (WikittyExtension extension : wikitty.getExtensions()) { - // add one by one to manage require - - // during loop add new when old one is found - if (extension.equals(oldExt)) { - addExtension(service, result, newExt); - } - else { - addExtension(service, result, extension); - } - } - - // Copy other values - Set<String> fqFieldNames = wikitty.fieldNames(); String extName = newExt.getName(); - for (String fieldName : fqFieldNames) { - if(!fieldName.startsWith(extName + ".")) { - Object value = wikitty.getFqField(fieldName); - log.debug("Value " + fieldName + "=" + value); - result.setFqField(fieldName, value); - } - } // Migrate field name Collection<String> oldFieldNames = oldExt.getFieldNames(); @@ -124,19 +64,19 @@ log.debug("Scan rename migration on " + extName + "." + fieldName + ":" + TAG_RENAME + "=" + renameFrom); if(StringUtils.isNotBlank(renameFrom)) { - Object value = wikitty.getFieldAsObject(extName, renameFrom); + Object value = oldWikitty.getFieldAsObject(extName, renameFrom); log.debug("Rename " + extName + "." + fieldName + "=" + value); - result.setField(extName, fieldName, value); + newWikitty.setField(extName, fieldName, value); } else { if(oldFieldNames.contains(fieldName)) { - Object value = wikitty.getFieldAsObject(extName, fieldName); + Object value = oldWikitty.getFieldAsObject(extName, fieldName); log.debug("Copy " + extName + "." + fieldName + "=" + value); - result.setField(extName, fieldName, value); + newWikitty.setField(extName, fieldName, value); } } } - return result; + return newWikitty; } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java 2013-08-09 09:04:14 UTC (rev 1573) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceEnhanced.java 2013-09-23 13:32:53 UTC (rev 1574) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.services; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -56,6 +57,14 @@ return store(securityToken, Collections.singleton(wikitty), false); } + public WikittyEvent store(String securityToken, Wikitty w1, Wikitty w2, Wikitty ... wN) { + List<Wikitty> ws = new ArrayList<Wikitty>(wN.length + 2); + Collections.addAll(ws, w1, w2); + Collections.addAll(ws, wN); + + return store(securityToken, ws, false); + } + public WikittyEvent store(String securityToken, Collection<Wikitty> wikitties) { return store(securityToken, wikitties, false); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2013-08-09 09:04:14 UTC (rev 1573) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2013-09-23 13:32:53 UTC (rev 1574) @@ -42,6 +42,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.TimeLog; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; @@ -49,6 +50,7 @@ import org.nuiton.wikitty.entities.FieldTypeConstaintChecker; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyImpl; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; import org.nuiton.wikitty.query.WikittyQuery; @@ -647,11 +649,61 @@ } /** - * Upgrade wikitty but not saved it. + * Recursively add extension with requires ones (orderer). + * + * @param extNames Extension name to load with required ones + * @param exts collection to put all extension result + * @return result argument + */ + protected LinkedHashSet<WikittyExtension> getExtension( + Collection<String> extNames, LinkedHashSet<WikittyExtension> exts) { + for (String name : extNames) { + WikittyExtension ext = restoreExtensionLastVersion(null, name); + List<String> requires = ext.getRequires(); + if (CollectionUtils.isNotEmpty(requires)) { + getExtension(requires, exts); + } + exts.add(ext); + } + return exts; + } + + /** + * Donne la classe de migration a utiliser pour une extension particuliere + * @param extensionName le nom de l'extension dont on veut la classe de migration + * si aucune classe de migration n'est enregistrer pour l'extension demande + * la classe de migration par defaut est utilisee + * @return + */ + protected WikittyExtensionMigration getMigration(String extensionName) { + WikittyExtensionMigration result = null; + + WikittyExtensionMigrationRegistry registry = + config.getObject(WikittyExtensionMigrationRegistry.class); + result = registry.get(extensionName); + // @deprecated a supprimer lorsque ce sera supprime de l'api + if (result == null) { + result = WikittyExtensionMigration.migrationRegistry.get(extensionName); + } + + if (result == null) { + result = defaultExtensionMigration; + } + return result; + } + + /** + * Upgrade wikitty and saved it if a migration is done. * On passe directement de la version du wikitty a la derniere version connue * car une installation pourrait faire un upgrade de plusieurs version * et donc certaine version de l'extension pourrait ne pas exister en local * + * La sauvegarde des objets migrer est necessaire au cas on le developpeur + * qui a implanter la migration a besoin de creer de nouveau objet durant + * la migration. Si on ne sauve pas l'objet initial, alors celui-ci pourrait + * etre potentiellement migrer plusieurs fois et donc des objets annexes + * seraient crees a chaque migration, au lieu d'etre crees une seul fois. + * * @param securityToken security token previously returned by login. If * securityToken is not valid, this method do nothing * @param wikitty to upgrade @@ -660,45 +712,49 @@ protected Wikitty upgradeData(String securityToken, Wikitty wikitty) { Wikitty result = wikitty; - Collection<WikittyExtension> extensions = wikitty.getExtensions(); - for (WikittyExtension extension : extensions) { - String extensionName = extension.getName(); + LinkedHashSet<WikittyExtension> newExt = getExtension(wikitty.getExtensionNames(), new LinkedHashSet<WikittyExtension>()); + Collection diff = CollectionUtils.disjunction(wikitty.getExtensions(), newExt); + if (!diff.isEmpty()) { + // les extensions on change, il faut faire la migration + // on commence par cree le nouveau wikitty avec les nouvelles extensions + String wikittyId = wikitty.getWikittyId(); + String wikittyVersion = wikitty.getWikittyVersion(); - if (log.isDebugEnabled()) { - log.debug("extensionName=" + extensionName); - } - - WikittyExtension currentExtension = extension; - String currentExtensionVersion = currentExtension.getVersion(); + result = new WikittyImpl(wikittyId); + result.setWikittyVersion(wikittyVersion); + result.addExtension(newExt); - WikittyExtension lastExtension = restoreExtensionLastVersion( - securityToken, extensionName); - String lastExtensionVersion = lastExtension.getVersion(); + // on migre ou copie extension par extension tous les champs + Collection<WikittyExtension> extensions = wikitty.getExtensions(); + for (WikittyExtension extension : extensions) { + String extensionName = extension.getName(); - if (log.isDebugEnabled()) { - log.debug(String.format("Migrate extension '%s' from '%s' to '%s'", - extensionName, currentExtensionVersion, lastExtensionVersion)); - } + if (log.isDebugEnabled()) { + log.debug("extensionName=" + extensionName); + } + WikittyExtension currentExtension = extension; + String currentExtensionVersion = currentExtension.getVersion(); - WikittyExtensionMigration migration = null; + WikittyExtension lastExtension = result.getExtension(extensionName); + String lastExtensionVersion = lastExtension.getVersion(); - WikittyExtensionMigrationRegistry registry = - config.getObject(WikittyExtensionMigrationRegistry.class); - migration = registry.get(extensionName); - // @deprecated a supprimer lorsque ce sera supprime de l'api - if (migration == null) { - migration = WikittyExtensionMigration.migrationRegistry.get(extensionName); - } - - if (migration == null) { - migration = defaultExtensionMigration; - } + if (log.isDebugEnabled()) { + log.debug(String.format("Migrate extension '%s' from '%s' to '%s'", + extensionName, currentExtensionVersion, lastExtensionVersion)); + } - if(WikittyUtil.versionGreaterThan(lastExtensionVersion, currentExtensionVersion)) { - result = migration.migrate(this, result, + + WikittyExtensionMigration migration = getMigration(extensionName); + + // no condition on extension, version, otherwize field is not copied in result, all extension must be migrated + result = migration.migrate(this, wikitty, result, currentExtension, lastExtension); } + + // if migration is done, store modified version and return it + WikittyClient wc = new WikittyClient(config, this, securityToken); + result = wc.store(result); } return result; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java 2013-08-09 09:04:14 UTC (rev 1573) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java 2013-09-23 13:32:53 UTC (rev 1574) @@ -96,12 +96,13 @@ public static class DummyMigration extends WikittyExtensionMigrationRename { - public Wikitty migrate(WikittyService service, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { + @Override + public Wikitty migrate(WikittyService service, Wikitty oldWikitty, Wikitty newWikitty, WikittyExtension oldExt, WikittyExtension newExt) { System.out.println(String.format("migrate %s(%s) oldExt %s newExt %s", - wikitty.getWikittyId(), wikitty.getExtension(extensionName).getId(), + oldWikitty.getWikittyId(), oldWikitty.getExtension(extensionName).getId(), oldExt.getId(), newExt.getId())); - Wikitty result = super.migrate(service, wikitty, oldExt, newExt); + Wikitty result = super.migrate(service, oldWikitty, newWikitty, oldExt, newExt); result.setField(extensionName, "string", "hello"); result.setField(extensionName, "date", new Date());

1 0