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

r288 - branches/wikitty-eugene-migration
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:31:52 +0200 (Thu, 09 Sep 2010) New Revision: 288 Url: http://nuiton.org/repositories/revision/wikitty/288 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: branches/wikitty-eugene-migration/pom.xml Modified: branches/wikitty-eugene-migration/pom.xml =================================================================== --- branches/wikitty-eugene-migration/pom.xml 2010-09-09 09:31:48 UTC (rev 287) +++ branches/wikitty-eugene-migration/pom.xml 2010-09-09 09:31:52 UTC (rev 288) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent>

1 0

r287 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:31:48 +0200 (Thu, 09 Sep 2010) New Revision: 287 Url: http://nuiton.org/repositories/revision/wikitty/287 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-08 15:54:56 UTC (rev 286) +++ trunk/pom.xml 2010-09-09 09:31:48 UTC (rev 287) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent>

1 0

r286 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/api
by jruchaud＠users.nuiton.org 08 Sep '10

08 Sep '10

Author: jruchaud Date: 2010-09-08 17:54:56 +0200 (Wed, 08 Sep 2010) New Revision: 286 Url: http://nuiton.org/repositories/revision/wikitty/286 Log: Add check on field name for extension Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-09-08 13:16:09 UTC (rev 285) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-09-08 15:54:56 UTC (rev 286) @@ -25,6 +25,8 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @@ -39,6 +41,9 @@ /** serialVersionUID. */ private static final long serialVersionUID = -3598621577607442972L; + /** Field name pattern only word character [a-zA-Z_0-9] is accepted */ + static protected Pattern fieldNamePattern = Pattern.compile("^\\w+$"); + /** * Property change support. * @@ -102,7 +107,11 @@ this.version = WikittyUtil.normalizeVersion(version); this.requires = requires; if (fields != null) { - this.fields = fields; + for (Map.Entry<String, FieldType> entry : fields.entrySet()) { + String fieldName = entry.getKey(); + FieldType fieldType = entry.getValue(); + addField(fieldName, fieldType); + } } } @@ -215,9 +224,14 @@ } public void addField(String fieldName, FieldType type) { - fields.put(fieldName, type); - // TODO EC20100610 null for old value - getPropertyChangeSupport().firePropertyChange("fields", null, fields); + Matcher matcher = fieldNamePattern.matcher(fieldName); + if(matcher.find()) { + fields.put(fieldName, type); + // TODO EC20100610 null for old value + getPropertyChangeSupport().firePropertyChange("fields", null, fields); + } else { + throw new IllegalArgumentException("For field name [" + fieldName +"], only word character [a-zA-Z_0-9] is accepted"); + } } public void removeField(String fieldName) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-08 13:16:09 UTC (rev 285) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-08 15:54:56 UTC (rev 286) @@ -27,6 +27,7 @@ import org.nuiton.wikitty.WikittyImpl; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.conform.StorageTest; +import org.springframework.test.annotation.ExpectedException; /** * Test Wikitty, Extensions, Field and FieldType through the Wikitty Object @@ -125,6 +126,19 @@ } @Test + public void testWikittyExtensionCorrectFieldName() throws Exception { + ExtensionFactory.create("correctExtension", "1") + .addField("correctFieldName", TYPE.NUMERIC).extension(); + } + + // Throw IllegalArgumentException because invalid character in field name + @Test(expected = IllegalArgumentException.class) + public void testWikittyExtensionIncorrectFieldName() throws Exception { + ExtensionFactory.create("incorrectExtension", "1") + .addField("incorrectFieldName#", TYPE.NUMERIC).extension(); + } + + @Test public void testFieldAssigment() throws Exception { Wikitty w = createBasicWikitty();

1 0

r285 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 08 Sep '10

08 Sep '10

Author: bpoussin Date: 2010-09-08 15:16:09 +0200 (Wed, 08 Sep 2010) New Revision: 285 Url: http://nuiton.org/repositories/revision/wikitty/285 Log: add cast method to convert business object to another (not tested :() Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-07 10:23:46 UTC (rev 284) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-09-08 13:16:09 UTC (rev 285) @@ -72,6 +72,21 @@ this.wikittyService = wikittyService; } + /** + * Cast Business objet to another Business Object + * If source don't have target extension, this extension is added + * + * @param source business entity source + * @param target business entity class wanted + * @return new instance of object wanted + */ + public <E extends BusinessEntityWikitty> E cast( + BusinessEntityWikitty source, Class<E> target) { + E result = WikittyUtil.newInstance( + securityToken, wikittyService, target, source.getWikitty()); + return result; + } + public <E extends BusinessEntity> E store(E e) { Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); UpdateResponse resp = wikittyService.store(securityToken, w);

1 0

r284 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport
by jcouteau＠users.nuiton.org 07 Sep '10

07 Sep '10

Author: jcouteau Date: 2010-09-07 12:23:46 +0200 (Tue, 07 Sep 2010) New Revision: 284 Url: http://nuiton.org/repositories/revision/wikitty/284 Log: remove * import Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-07 10:13:04 UTC (rev 283) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-07 10:23:46 UTC (rev 284) @@ -29,7 +29,17 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.*; +import org.nuiton.wikitty.Criteria; +import org.nuiton.wikitty.FacetTopic; +import org.nuiton.wikitty.FieldType; +import org.nuiton.wikitty.PagedResult; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyTransaction; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search;

1 0

r283 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport
by jcouteau＠users.nuiton.org 07 Sep '10

07 Sep '10

Author: jcouteau Date: 2010-09-07 12:13:04 +0200 (Tue, 07 Sep 2010) New Revision: 283 Url: http://nuiton.org/repositories/revision/wikitty/283 Log: throws a wikittyException if a required extension is not present in base during import. It simplifies debugging. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-07 09:44:57 UTC (rev 282) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-07 10:13:04 UTC (rev 283) @@ -29,16 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.FacetTopic; -import org.nuiton.wikitty.FieldType; -import org.nuiton.wikitty.PagedResult; -import org.nuiton.wikitty.Wikitty; -import org.nuiton.wikitty.WikittyExtension; -import org.nuiton.wikitty.WikittyImpl; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyTransaction; -import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.*; import org.nuiton.wikitty.search.Element; import org.nuiton.wikitty.search.Search; @@ -150,6 +141,8 @@ /** * Recusively add missing extension of not exist and required extension too. + * + * @throws WikittyException if the extension does not exist in base */ protected void addMissingExtension(String securityToken, WikittyService ws, WikittyTransaction transaction, Wikitty currentWikitty, String extName) { @@ -158,16 +151,20 @@ WikittyExtension extension = ws.restoreExtensionLastVersion( securityToken, transaction, extName); - String requires = extension.getRequires(); - if (StringUtils.isNotEmpty(requires)) { - // add required extensions BEFORE current - for (String require : requires.split(",")) { - String localRequire = require.trim(); - addMissingExtension(securityToken, ws, transaction, currentWikitty, localRequire); + if (extension != null) { + String requires = extension.getRequires(); + if (StringUtils.isNotEmpty(requires)) { + // add required extensions BEFORE current + for (String require : requires.split(",")) { + String localRequire = require.trim(); + addMissingExtension(securityToken, ws, transaction, currentWikitty, localRequire); + } } - } - currentWikitty.addExtension(extension); + currentWikitty.addExtension(extension); + } else { + throw new WikittyException("Extension " + extName + " does not exist"); + } } }

1 0

r282 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport
by jcouteau＠users.nuiton.org 07 Sep '10

07 Sep '10

Author: jcouteau Date: 2010-09-07 11:44:57 +0200 (Tue, 07 Sep 2010) New Revision: 282 Url: http://nuiton.org/repositories/revision/wikitty/282 Log: Fix an ArrayOutOfBoundException on import Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-02 16:24:08 UTC (rev 281) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-07 09:44:57 UTC (rev 282) @@ -90,11 +90,14 @@ } // create a wikitty for each next line - String[] currentLine = null; + String[] currentLine; while ((currentLine = csvReader.readNext()) != null) { - String wikittyId = currentLine[wikittyIdIndex]; - Wikitty currentWikitty = null; + String wikittyId=""; + if (wikittyIdIndex != -1){ + wikittyId = currentLine[wikittyIdIndex]; + } + Wikitty currentWikitty; if (StringUtils.isNotEmpty(wikittyId)) { currentWikitty = new WikittyImpl(wikittyId); }

1 0

r281 - in trunk/wikitty-api/src/main/java/org/nuiton/wikitty: . importexport
by echatellier＠users.nuiton.org 02 Sep '10

02 Sep '10

Author: echatellier Date: 2010-09-02 18:24:08 +0200 (Thu, 02 Sep 2010) New Revision: 281 Url: http://nuiton.org/repositories/revision/wikitty/281 Log: Fix #843 : Erreur de transaction JTA lors de l'mport CSV Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-09-02 16:24:08 UTC (rev 281) @@ -332,6 +332,17 @@ * @return wikitty object or null */ public Wikitty findByCriteria(String securityToken, Criteria criteria); + + /** + * Fist lonely (or first one) wikitty object that match criteria, if no + * wikitty found or first retrived is not authorized for the user return + * null + * + * @param criteria + * @param transaction + * @return wikitty object or null + */ + public Wikitty findByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria); /* * Labelisation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-09-02 16:24:08 UTC (rev 281) @@ -282,6 +282,23 @@ /** * just wrap service method * + * @param securityToken + * @param criteria + * @param transaction + * + * @return + */ + @Override + public Wikitty findByCriteria(String securityToken, + WikittyTransaction transaction, Criteria criteria) { + // if we want to add cache for this method, we must clear cache when + // addLabel, store, storeExtension are called + return ws.findByCriteria(securityToken, transaction, criteria); + } + + /** + * just wrap service method + * * @param label * @return */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-09-02 16:24:08 UTC (rev 281) @@ -216,6 +216,11 @@ } @Override + public Wikitty findByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { + return delegate.findByCriteria(securityToken, transaction, criteria); + } + + @Override public void addLabel(String securityToken, String wikittyId, String label) { delegate.addLabel(securityToken, wikittyId, label); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-02 16:24:08 UTC (rev 281) @@ -636,7 +636,7 @@ } } - protected Wikitty findByCriteria(String securityToken, + public Wikitty findByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { criteria.setFirstIndex(0).setEndIndex(1); PagedResult<String> pages = findAllByCriteria( Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-09-02 16:24:08 UTC (rev 281) @@ -363,6 +363,12 @@ // no notification return ws.findByCriteria(securityToken, criteria); } + + @Override + public Wikitty findByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { + // no notification + return ws.findByCriteria(securityToken, transaction, criteria); + } @Override public void addLabel(String securityToken, String wikittyId, String label) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-09-02 16:24:08 UTC (rev 281) @@ -420,6 +420,16 @@ } @Override + public Wikitty findByCriteria(String securityToken, WikittyTransaction transaction, Criteria criteria) { + Wikitty result = ws.findByCriteria(securityToken, transaction, criteria); + if (!canRead(securityToken, result.getId())) { + // user don't have correct right, return null + result = null; + } + return result; + } + + @Override public void addLabel(String securityToken, String wikittyId, String label) { // TODO poussin 20100607 check security ws.addLabel(securityToken, wikittyId, label); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-09-02 16:24:08 UTC (rev 281) @@ -120,7 +120,7 @@ addMissingExtension(securityToken, ws, transaction, currentWikitty, extName); // convert link values (if necessary) - value = convertLinkValues(securityToken, ws, value); + value = convertLinkValues(securityToken, transaction, ws, value); // add value to correct field FieldType fieldType = currentWikitty.getFieldType(extName + "." + fieldName); @@ -175,7 +175,7 @@ * @return */ protected String convertLinkValues( - String securityToken, WikittyService ws, String value) { + String securityToken, WikittyTransaction transaction, WikittyService ws, String value) { String originalValue = value; String resultValue = ""; @@ -196,7 +196,7 @@ fValue = m.group(6); } Criteria criteria = Search.query().eq(fqField, fValue).criteria(); - Wikitty wikitty = ws.findByCriteria(securityToken, criteria); + Wikitty wikitty = ws.findByCriteria(securityToken, transaction, criteria); if (wikitty == null) { correctQueries = false; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-08-31 17:19:55 UTC (rev 280) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-09-02 16:24:08 UTC (rev 281) @@ -36,7 +36,7 @@ transaction.begin(); WikittyBatchUpdate batchUpdate = new WikittyBatchUpdate( securityToken, ws, transaction); - + long time = 0; if (log.isInfoEnabled()) { time = System.currentTimeMillis();

1 0