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

r1257 - trunk
by maven-release＠users.nuiton.org 28 Nov '11

28 Nov '11

Author: maven-release Date: 2011-11-28 23:22:29 +0100 (Mon, 28 Nov 2011) New Revision: 1257 Url: http://nuiton.org/repositories/revision/wikitty/1257 Log: Update mavenpom4redmine to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-22 13:50:13 UTC (rev 1256) +++ trunk/pom.xml 2011-11-28 22:22:29 UTC (rev 1257) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent>

1 0

r1256 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/api
by bpoussin＠users.nuiton.org 22 Nov '11

22 Nov '11

Author: bpoussin Date: 2011-11-22 14:50:13 +0100 (Tue, 22 Nov 2011) New Revision: 1256 Url: http://nuiton.org/repositories/revision/wikitty/1256 Log: small bug in format method correction in toBigDecimal when argument is empty string Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-11-20 14:58:36 UTC (rev 1255) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-11-22 13:50:13 UTC (rev 1256) @@ -411,7 +411,7 @@ for (String field : fields) { values[i++] = w.getFqField(field); // i is incremented before replace, because String.format start at 1 not 0 - format = format.replaceAll("%"+Pattern.quote(field)+"\\$", "\\%"+i+"\\$"); + format = format.replaceAll("%"+Pattern.quote(field)+"(\\|.*?)?\\$", "\\%"+i+"\\$"); } // on remplace tous les champs non trouve @@ -460,7 +460,7 @@ */ static public BigDecimal toBigDecimal(Object value) { BigDecimal result = null; - if (value == null) { + if (value == null || "".equals(value)) { result = new BigDecimal(0); // default to 0 } else if (value instanceof BigDecimal) { result = (BigDecimal) value; 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 2011-11-20 14:58:36 UTC (rev 1255) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2011-11-22 13:50:13 UTC (rev 1256) @@ -74,6 +74,12 @@ group.getWikitty()); Assert.assertEquals("Group Name = Mon Groupe", result); + // test un cas passant + result = WikittyUtil.format( + "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"|noname$s", + group.getWikitty()); + Assert.assertEquals("Group Name = Mon Groupe", result); + // test un cas passant avec deux fois le meme champs result = WikittyUtil.format( "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"$s(%"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"$s)",

1 0

r1255 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/main/java/org/nuiton/wikitty/storage wikitty-publication/src/main/java/org/nuiton/wikitty/publication wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 20 Nov '11

20 Nov '11

Author: bpoussin Date: 2011-11-20 15:58:36 +0100 (Sun, 20 Nov 2011) New Revision: 1255 Url: http://nuiton.org/repositories/revision/wikitty/1255 Log: Evolution #1816: Add criteria name in PagedResult Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/PagedResult.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -64,6 +64,8 @@ /** serialVersionUID. */ private static final long serialVersionUID = 8518774558223121855L; + /** nom du critere qui a ete uitilise (peut-etre null) si le critete n'avait pas de nom */ + protected String criteriaName; /** indice element in global search result */ protected int firstIndice; /** total number of result if we call the query for all possible result */ @@ -92,8 +94,10 @@ * @param facets facet asked or null if no facet * @param results list of result in the wanted interval */ - public PagedResult(int firstIndice, int numFound, String queryString, + public PagedResult(String criteriaName, + int firstIndice, int numFound, String queryString, Map<String, List<FacetTopic>> facets, List<T> results) { + this.criteriaName = criteriaName; this.firstIndice = firstIndice; this.numFound = numFound; this.queryString = queryString; @@ -142,7 +146,7 @@ " wikitty String id but " + results.get(0).getClass()); } } - PagedResult<Wikitty> result = new PagedResult<Wikitty>( + PagedResult<Wikitty> result = new PagedResult<Wikitty>(criteriaName, firstIndice, numFound, queryString, facets, castedResult); return result; } @@ -212,11 +216,15 @@ } } } - PagedResult<E> result = new PagedResult<E>( + PagedResult<E> result = new PagedResult<E>(criteriaName, firstIndice, numFound, queryString, facets, castedResult); return result; } + public String getCriteriaName() { + return criteriaName; + } + public int getFirstIndice() { return firstIndice; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -331,6 +331,7 @@ } } + String criteriaName = resultWs.getCriteriaName(); int firstIndice = resultWs.getFirstIndice(); // FIXME le resultat est faux, le nombre total n'est pas la somme des deux :( int numFound = resultTx.getNumFound() + resultWs.getNumFound(); @@ -339,7 +340,7 @@ Map<String, List<FacetTopic>> facets = resultWs.getFacets(); List<String> results = new ArrayList<String>(ids); - result.add(new PagedResult<String>( + result.add(new PagedResult<String>(criteriaName, firstIndice, numFound, queryString, facets, results)); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -421,7 +421,8 @@ } } } - return new PagedResult<String>(firstIndex, ids.size(), criteria.getRestriction().toString(), null, ids); + return new PagedResult<String>(criteria.getName(), + firstIndex, ids.size(), criteria.getRestriction().toString(), null, ids); } @Override Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -521,7 +521,9 @@ } } } - result.add(new PagedResult<String>(firstIndex, ids.size(), + result.add(new PagedResult<String>( + cr.getName(), + firstIndex, ids.size(), restriction.toString(), null, ids)); } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -355,6 +355,7 @@ // rebuild the result to match the expected criteria tempPagedResult = new PagedResult<String>( + currentCrit.getName(), currentCrit.getFirstIndex(), tempPagedResult.getNumFound(), currentCrit.toString(), @@ -407,6 +408,7 @@ // rebuilt the result PagedResult<String> tempPagedResult = new PagedResult<String>( + currentCrit.getName(), currentCrit.getFirstIndex(), number, currentCrit.toString(), currentResult.getFacets(), allresult); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-11-20 13:38:48 UTC (rev 1254) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-11-20 14:58:36 UTC (rev 1255) @@ -804,7 +804,8 @@ // Build paged result PagedResult<String> result = new PagedResult<String>( - firstIndex, numFound, queryString, facets, ids); + criteria.getName(), + firstIndex, numFound, queryString, facets, ids); return result; } catch (SolrServerException eee) {

1 0

20 Nov '11

Author: bpoussin Date: 2011-11-20 14:38:48 +0100 (Sun, 20 Nov 2011) New Revision: 1254 Url: http://nuiton.org/repositories/revision/wikitty/1254 Log: Evolution #1815: Better support of toString representation for extension many small correction in tagValue support for extension Modified: trunk/wikitty-api/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.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/WikittyExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/pom.xml 2011-11-20 13:38:48 UTC (rev 1254) @@ -19,6 +19,14 @@  + +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${project.version}</version> + </dependency> +  <dependency> <groupId>gnu.cajo</groupId> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -57,6 +57,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Set; import java.util.TimeZone; import java.util.UUID; import java.util.regex.Matcher; @@ -64,11 +65,13 @@ import net.iharder.Base64; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.converters.DateTimeConverter; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.time.DateUtils; import org.apache.commons.lang.time.FastDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.generator.WikittyTransformerUtil; /** * Util static method for wikitty. @@ -229,16 +232,7 @@ * @return string represent tagValues */ public static String tagValuesToString(Map<String, String> tagValues) { - String result = ""; - if(tagValues != null) { - for (String tag : tagValues.keySet()) { - String value = tagValues.get(tag); - // replaceWith " in string with \" - value = value.replaceAll("\"", "\\\\\""); - // quote value with "..." - result += " " + tag + "=\"" + tagValues.get(tag) +"\""; - } - } + String result = WikittyTransformerUtil.tagValuesToString(tagValues); return result; } @@ -259,7 +253,7 @@ // delete start and end " value = value.substring(1, value.length() - 1); // if value is between ", then inners " are quoted - value = value.replaceAll("\\\\\"", "\""); + value = StringEscapeUtils.unescapeJava(value); } result.put(tag, value); } @@ -393,7 +387,45 @@ return result; } + /** Pattern de recherche des field dans les chaines de formatage */ + static protected Pattern formatMatcher = + Pattern.compile("%[^0-9][^|$]*(\\|(.*?))?\\$[0-9]*?[a-zA-Z]"); /** + * Format wikitty for string representation. + * exemple: + * <li> "%Person.lastName$s %Person.firstName$s: %Person.birthday$tm %Person.birthday$te,%Person.birthday$tY" + * <li> "Hello %Person.firstName|unknow$s" if firstName field doesn't exist, unknow is used + * + * @param format format as {@link http://download.oracle.com/javase/6/docs/api/java/util/Formatter.html#synta… + * execpt that position is replace with fq field name. + * @param w wikitty to format + * @return String that represent the wikitty + */ + static public String format(String formatWikitty, Wikitty w) { + Set<String> fields = w.getAllFieldNames(); + Object[] values = new Object[fields.size()]; + + String format = formatWikitty; + // convert Map field to array + int i = 0; + for (String field : fields) { + values[i++] = w.getFqField(field); + // i is incremented before replace, because String.format start at 1 not 0 + format = format.replaceAll("%"+Pattern.quote(field)+"\\$", "\\%"+i+"\\$"); + } + + // on remplace tous les champs non trouve + format = formatMatcher.matcher(format).replaceAll("$2"); + if (log.isDebugEnabled()) { + log.debug(String.format("%s -> %s (with %s)", formatWikitty, format, fields)); + } + + // use standard String.format + String result = String.format(format, values); + return result; + } + + /** * Get value as Binary. * * @param value null and empty return empty byte[] Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -90,7 +90,8 @@ String extName = xpp.getAttributeValue(null, "name"); String version = xpp.getAttributeValue(null, "version"); String requires = xpp.getAttributeValue(null, "requires"); - ext = new WikittyExtension(extName, version, requires, + // FIXME poussin 20111120 il faut aussi avoir les tagValues de l'extension + ext = new WikittyExtension(extName, version, null, requires, new LinkedHashMap<String, FieldType>()); } else if ("object".equals(name)) { String id = xpp.getAttributeValue(null, "id"); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/ExtensionFactory.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -24,7 +24,10 @@ */ package org.nuiton.wikitty.entities; +import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.Map; +import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType.TYPE; @@ -32,6 +35,7 @@ protected String name; protected String version; + protected Map<String, String> tagValues; protected String requiredExtension; protected LinkedHashMap<String, FieldType> fields; @@ -51,10 +55,28 @@ } public WikittyExtension extension() { - WikittyExtension ext = new WikittyExtension(name, version, requiredExtension, fields); + WikittyExtension ext = new WikittyExtension( + name, version, tagValues, requiredExtension, fields); return ext; } - + + public ExtensionFactory addTagValues(Map<String, String> tagValues) { + if (this.tagValues == null) { + this.tagValues = new HashMap<String, String>(); + } + this.tagValues.putAll(tagValues); + return this; + } + + public ExtensionFactory addTagValues(String tagValues) { + if (this.tagValues == null) { + this.tagValues = new HashMap<String, String>(); + } + Map<String, String> tv = WikittyUtil.tagValuesToMap(tagValues); + this.tagValues.putAll(tv); + return this; + } + protected void add(String fieldName, FieldType fieldType) { fields.put(fieldName, fieldType); } 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 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -323,7 +323,7 @@ Map<String, Object> getFieldValue(); /** - * Return all fieldName available in all extension + * Return all fieldName available in all extension. Field is fq. * @return * * @since 3.1 @@ -368,4 +368,11 @@ */ Wikitty clone() throws CloneNotSupportedException; + /** + * Return String representation of this wikitty with toString specific + * format of extension passed in argument. If this extension doesn't have + * specifique toString, normal toString is called {@link #toString()} + */ + public String toString(String extName); + } \ No newline at end of file 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 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -103,7 +103,7 @@ } /** - * ATTENTION, la condition d'egalite n'est pas faire sur le type d'objet, + * ATTENTION, la condition d'egalite n'est pas faite sur le type d'objet, * mais seulement sur le contenu des donnees. Le equals repond a la question * "Est-ce qu'on represente le meme wikitty ?". * @@ -116,6 +116,11 @@ } @Override + public String toString(String extName) { + return target.toString(extName); + } + + @Override public int hashCode() { return target.hashCode(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -42,6 +42,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.generator.WikittyTransformerUtil; /** * @@ -108,22 +109,22 @@ public WikittyExtension(String name, String version, LinkedHashMap<String, FieldType> fields) { - this(name, version, (List)null, fields); + this(name, version, (Map)null, (List)null, fields); } - public WikittyExtension(String name, String version, + public WikittyExtension(String name, String version, Map<String, String> tagValues, String requires, LinkedHashMap<String, FieldType> fields) { - this(name, version, StringUtils.split(requires, ","), fields); + this(name, version, tagValues, StringUtils.split(requires, ","), fields); } - public WikittyExtension(String name, String version, + public WikittyExtension(String name, String version, Map<String, String> tagValues, String[] requires, LinkedHashMap<String, FieldType> fields) { - this(name, version, + this(name, version, tagValues, ArrayUtils.isEmpty(requires)?(List)null:Arrays.asList(requires), fields); } - public WikittyExtension(String name, String version, + public WikittyExtension(String name, String version, Map<String, String> tagValues, List<String> requires, LinkedHashMap<String, FieldType> fields) { if (version == null) { throw new IllegalArgumentException("Version must not be null"); @@ -131,6 +132,7 @@ setName(name); this.version = WikittyUtil.normalizeVersion(version); setRequires(requires); + setTagValues(tagValues); if (fields != null) { for (Map.Entry<String, FieldType> entry : fields.entrySet()) { String fieldName = entry.getKey(); @@ -186,7 +188,8 @@ } } - WikittyExtension result = new WikittyExtension(name, nextRevision, requires, nextFields); + WikittyExtension result = new WikittyExtension( + name, nextRevision, tagValues, requires, nextFields); return result; } @@ -403,4 +406,21 @@ return result; } + /** + * Return toString representation. Use tagValue 'toString' format if exist, + * else standard Wikitty.toString is call + * + * @param wikitty + * @return + */ + public String toString(Wikitty wikitty) { + String result; + String format = getTagValue(WikittyTransformerUtil.TAG_TO_STRING); + if (StringUtils.isNotBlank(format)) { + result = WikittyUtil.format(format, wikitty); + } else { + result = wikitty.toString(); + } + return result; + } } 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 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -958,6 +958,18 @@ } /** + * Return String representation of this wikitty with toString specific + * format of extension passed in argument. If this extension doesn't have + * specifique toString, normal toString is called {@link #toString()} + */ + @Override + public String toString(String extName) { + WikittyExtension ext = getExtension(extName); + String result = ext.toString(this); + return result; + } + + /** * Clone is deep for extension and values * @return * @throws CloneNotSupportedException 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 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -93,11 +93,11 @@ wikitty.addExtension(ext); Assert.assertTrue( wikitty.hasExtension("master") ); - ext = new WikittyExtension( "slave", "1", "master", null); + ext = new WikittyExtension( "slave", "1", null, "master", null); wikitty.addExtension(ext); Assert.assertTrue( wikitty.hasExtension("slave") ); - ext = new WikittyExtension("badslave", "1", "nomaster", null); + ext = new WikittyExtension("badslave", "1", null, "nomaster", null); try { wikitty.addExtension(ext); Assert.assertFalse(true); 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 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -31,7 +31,6 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -53,6 +52,7 @@ import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.WikittyGroupImpl; import org.nuiton.wikitty.services.WikittyServiceInMemory; /** @@ -63,6 +63,49 @@ static private Log log = LogFactory.getLog(WikittyUtilTest.class); + @Test + public void testFormat() { + WikittyGroupImpl group = new WikittyGroupImpl(); + group.setName("Mon Groupe"); + + // test un cas passant + String result = WikittyUtil.format( + "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"$s", + group.getWikitty()); + Assert.assertEquals("Group Name = Mon Groupe", result); + + // test un cas passant avec deux fois le meme champs + result = WikittyUtil.format( + "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"$s(%"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"$s)", + group.getWikitty()); + Assert.assertEquals("Group Name = Mon Groupe(Mon Groupe)", result); + + // test un cas ou le champs demande n'existe pas dans le wikitty (sans remplacement) + result = WikittyUtil.format( + "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"toto$s", + group.getWikitty()); + Assert.assertEquals("Group Name = ", result); + + // test un cas ou le champs demande n'existe pas dans le wikitty (sans remplacement) + // avec deux fois le meme champs + result = WikittyUtil.format( + "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"toto$s(%"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"tata$s)", + group.getWikitty()); + Assert.assertEquals("Group Name = ()", result); + + // test un cas ou le champs demande n'existe pas dans le wikitty (sans remplacement) + result = WikittyUtil.format( + "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"toto|$s", + group.getWikitty()); + Assert.assertEquals("Group Name = ", result); + + // test un cas ou le champs demande n'existe pas dans le wikitty (avec remplacement + result = WikittyUtil.format( + "Group Name = %"+WikittyGroupImpl.FQ_FIELD_WIKITTYGROUP_NAME+"toto|noname$s", + group.getWikitty()); + Assert.assertEquals("Group Name = noname", result); + } + /** * Test of normalizeVersion method, of class WikittyUtil. */ Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -113,7 +113,7 @@ for ( int i = 0; i < types.length; i++ ) { fieldsMap.put( "fieldName" + i, types[i] ); } - return new WikittyExtension(extName, "1", requires, fieldsMap); + return new WikittyExtension(extName, "1", null, requires, fieldsMap); } public static String format(String dateTestFormat) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -128,11 +128,11 @@ public void testRequire() throws Exception { WikittyExtension extension = new WikittyExtension("Extension", "1", WikittyUtil.buildFieldMapExtension("String value")); - WikittyExtension extension1 = new WikittyExtension("Extension1", "1", "Extension", + WikittyExtension extension1 = new WikittyExtension("Extension1", "1", null, "Extension", WikittyUtil.buildFieldMapExtension("String value")); - WikittyExtension extension11 = new WikittyExtension("Extension11", "1", "Extension1", + WikittyExtension extension11 = new WikittyExtension("Extension11", "1", null, "Extension1", WikittyUtil.buildFieldMapExtension("String value")); - WikittyExtension extension2 = new WikittyExtension("Extension2", "1", "Extension", + WikittyExtension extension2 = new WikittyExtension("Extension2", "1", null, "Extension", WikittyUtil.buildFieldMapExtension("String value")); Wikitty wikitty = createWikitty("Extension.value = 123", 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 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -45,8 +45,6 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /*{generator option: writeString = }*/ /*{generator option: parentheses = false}*/ @@ -63,12 +61,6 @@ protected Map<ObjectModelClass, ObjectModelClass> processedClasses = new HashMap<ObjectModelClass, ObjectModelClass>(); - /** pattern to parse toString tagValue - * for the string "abc{foo|bar}defrzeg{uvw|xyz}oeira" - * will match {foo|bar} and {uvw|xyz} with groups for foo, bar, uvw and xyz - */ - protected Pattern toStringTagValuePattern = Pattern.compile("\\{(([^|}])*)(?:\\|([^}]*))?\\}"); - /** 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() */ @@ -284,13 +276,18 @@ requires = "(List)null"; } - String buildFieldMapExtensionParametersInLine = StringUtils.join(buildFieldMapExtensionParameters, ", \n"); - String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, false); + String tagValues = StringEscapeUtils.escapeJava( + WikittyTransformerUtil.tagValuesToString(businessEntity.getTagValues())); + String buildFieldMapExtensionParametersInLine = + StringUtils.join(buildFieldMapExtensionParameters, ", \n"); + String extensionVariableName = + WikittyTransformerUtil.classToExtensionVariableName(businessEntity, false); String staticInitializationBody = "" /*{ extension<%=businessEntity.getName()%> = new WikittyExtension(<%=extensionVariableName%>, "<%=extensionVersion%>", // version + WikittyUtil.tagValuesToMap("<%=tagValues%>"), // tag/values <%= requires %>, WikittyUtil.buildFieldMapExtension( // building field map <%=buildFieldMapExtensionParametersInLine%>)); @@ -521,66 +518,34 @@ } } - /** add a toString method + /** + * add a toString method. * if a toString is tagValue is attached to businessEntity, it will be used * to generate a toString as this : - * - * given "hello {Person.name|unknow}" - * - * will try to replace first {...} by name field value for extension Person. + * <pre> + * given "hello %Person.name|unknow$s" + * </pre> + * will try to replace field name by field value for extension Person. * if this information is not available, will do unknow. + * <p> + * use same syntaxe that {@link http://download.oracle.com/javase/6/docs/api/java/util/Formatter.html#synta… + * * @param businessEntity * @param abstractClass */ protected void addToString(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { - - String toStringOperationBody = null; - - if (businessEntity.hasTagValue(WikittyTransformerUtil.TAG_TO_STRING)) { - String toStringPattern = businessEntity.getTagValue(WikittyTransformerUtil.TAG_TO_STRING); - - // toStringPattern is something like - // "hello {Person.name|unknow} employe of {Company.name|unknow}" - // - - Matcher matcher = toStringTagValuePattern.matcher(toStringPattern); - - while (matcher.find()) { - String wholeMatch = matcher.group(0); // "{foo|bar}" - String variableName = matcher.group(1); // "foo" - String defaultValue = matcher.group(3); // "bar", may be null - - if (defaultValue == null) { - defaultValue = ""; - } - - if (attributeToGetterName.containsKey(variableName)) { - String getterName = attributeToGetterName.get(variableName); - toStringPattern = toStringPattern.replace(wholeMatch, "" -/*{" - + <%=getterName%>().toString() + - "}*/); - } else { - log.warn("no field " + variableName + " in " + businessEntity.getQualifiedName()); - toStringPattern = toStringPattern.replace(wholeMatch, defaultValue); - } - } - - toStringOperationBody = "" -/*{ - return "<%=toStringPattern%>"; -}*/; - } else { - // no toString tagValue provided, generating a default toString - toStringOperationBody = "" -/*{ - return getWikitty().toString(); -}*/; - } - + String helperClassName = WikittyTransformerUtil.businessEntityToHelperName(businessEntity); ObjectModelOperation toString = addOperation(abstractClass, "toString", "String"); + setDocumentation(toString, + "Return toString representation. Use tagValue '" + + WikittyTransformerUtil.TAG_TO_STRING + + "' format, if exist, else standard toString is call"); addAnnotation(abstractClass, toString, "Override"); - setOperationBody(toString, toStringOperationBody); + setOperationBody(toString, "" +/*{ + + return <%=helperClassName%>.toString(getWikitty()); +}*/); } protected void addMetaExtensionOperations(ObjectModelClass metaExtension, 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 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -285,6 +285,18 @@ wikitty.addExtension(ext); } }*/); + + ObjectModelOperation toString = addOperation(helper, "toString", "String", ObjectModelModifier.STATIC); + addParameter(toString, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setDocumentation(toString, + "Return toString representation. Use tagValue '" + + WikittyTransformerUtil.TAG_TO_STRING + + "' format, if exist, else standard toString is call"); + setOperationBody(toString, "" +/*{ + + return wikitty.toString(<%=extensionVariableName%>); +}*/); } /** Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -27,7 +27,9 @@ import java.util.Date; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -51,7 +53,7 @@ protected static final String TAG_VERSION = "version"; protected static final String TAG_ALTERNATIVE_NAME = "alternativeName"; - protected static final String TAG_TO_STRING = "toString"; + public static final String TAG_TO_STRING = "toString"; protected static final String TAG_DOCUMENTATION = "documentation"; /** @deprecated name change : see ticket #798. use BUSINESS_ENTITY_STEREOTYPE_NAME */ @@ -261,4 +263,18 @@ public static String businessEntityToHelperName(ObjectModelClass clazz) { return clazz.getName() + "Helper"; } + + public static String tagValuesToString(Map<String, String> tagValues) { + String result = ""; + if(tagValues != null) { + for (String tag : tagValues.keySet()) { + String value = tagValues.get(tag); + // replaceWith " in string with \" + value = StringEscapeUtils.escapeJava(value); + // quote value with "..." + result += " " + tag + "=\"" + value +"\""; + } + } + return result; + } } Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2011-11-19 17:14:39 UTC (rev 1253) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2011-11-20 13:38:48 UTC (rev 1254) @@ -378,12 +378,12 @@ fieldTypes.put(fieldName, fieldType); } + String extTagValues = adminResultSet.getString(COL_TAGVALUES); + Map<String, String> tagValues = WikittyUtil.tagValuesToMap(extTagValues); String extRequires = adminResultSet.getString(COL_REQUIRES); - result = new WikittyExtension(extName, extVersion, extRequires, fieldTypes); + result = new WikittyExtension( + extName, extVersion, tagValues, extRequires, fieldTypes); - String extTagValues = adminResultSet.getString(COL_TAGVALUES); - result.setTagValues(WikittyUtil.tagValuesToMap(extTagValues)); - // synchronisation pour supporter le multithreading synchronized (extensionCache) { // FIXME poussin 20100114 put that in abstractService after commit, because must in cache only when tx is commited

1 0

r1253 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/entities wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by bpoussin＠users.nuiton.org 19 Nov '11

19 Nov '11

Author: bpoussin Date: 2011-11-19 18:14:39 +0100 (Sat, 19 Nov 2011) New Revision: 1253 Url: http://nuiton.org/repositories/revision/wikitty/1253 Log: Evolution #1814: Add method on Proxy and Service to retrieve extensions and all dependencies Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -1331,6 +1331,23 @@ return extension; } + /** + * Search extension with name in last version. + * + * @param extensionNames extension name + * @return extension wanted with dependencies extensions at head of list + */ + public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion(Collection<String> extensionNames) { + long start = TimeLog.getTime(); + List<WikittyExtension> result = + wikittyService.restoreExtensionAndDependenciesLastVesion( + securityToken, extensionNames); + + timeLog.log(start, "restoreExtensionAndDependenciesLastVesion"); + 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/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -281,6 +281,15 @@ String securityToken, String name); /** + * Search extension with name in last version. + * + * @param extensionNames extension name + * @return extension wanted with dependencies extensions at head of list + */ + public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion( + String securityToken, Collection<String> extensionNames); + + /** * Restore wikitty * * @param securityToken security token Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyExtension.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -74,9 +74,6 @@ /** * Name of others extensions needed to put this extension to object. - * - * Warning : Multiples extensions are not supported yet. - * */ protected List<String> requires; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceDelegator.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -150,6 +150,12 @@ return delegate.restoreExtensionLastVersion(securityToken, name); } + public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion( + String securityToken, Collection<String> extensionNames) { + return delegate.restoreExtensionAndDependenciesLastVesion( + securityToken, extensionNames); + } + @Override public List<Wikitty> restore(String securityToken, List<String> id) { return delegate.restore(securityToken, id); 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 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -38,6 +38,7 @@ import java.util.Map; import java.util.Set; import java.util.LinkedHashSet; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -469,10 +470,57 @@ if (tx != null && tx.isStarted()) { tx.rollback(); } - throw new WikittyException("Can't store extensions", eee); + throw new WikittyException("Can't restore extensions", eee); } } + @Override + public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion( + String securityToken, Collection<String> extensionNames) { + WikittyTransaction tx = WikittyTransaction.get(); + boolean txBeginHere = false; + try { + if (!tx.isStarted()) { + tx.begin(); + txBeginHere = true; + } + + List<WikittyExtension> result = new ArrayList<WikittyExtension>(); + + for (String extName : extensionNames) { + WikittyExtension ext = restoreExtensionLastVersion( + securityToken, extName); + if (ext != null) { + // on recherche les dependances de cette extension ... + List<String> requires = ext.getRequires(); + if (CollectionUtils.isNotEmpty(requires)) { + List<WikittyExtension> dependencies = + restoreExtensionAndDependenciesLastVesion( + securityToken, requires); + // ... et on les ajoute avant dans le resultat + result .addAll(dependencies); + } + result.add(ext); + } + } + + if (txBeginHere) { + tx.commit(); + } + return result; + } catch (WikittyException ex) { + if (tx != null && tx.isStarted()) { + tx.rollback(); + } + throw ex; + } catch (Exception eee) { + if (tx != null && tx.isStarted()) { + tx.rollback(); + } + throw new WikittyException("Can't restore extensions", eee); + } + } + /** * restore one wikitty * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceTransaction.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -28,12 +28,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -248,6 +248,29 @@ } @Override + public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion(String securityToken, Collection<String> extensionNames) { + List<WikittyExtension> result = new ArrayList<WikittyExtension>(); + + for (String extName : extensionNames) { + WikittyExtension ext = restoreExtensionLastVersion( + securityToken, extName); + if (ext != null) { + // on recherche les dependances de cette extension ... + List<String> requires = ext.getRequires(); + if (CollectionUtils.isNotEmpty(requires)) { + List<WikittyExtension> dependencies = + restoreExtensionAndDependenciesLastVesion( + securityToken, requires); + // ... et on les ajoute avant dans le resultat + result .addAll(dependencies); + } + result.add(ext); + } + } + return result; + } + + @Override public List<Wikitty> restore(String securityToken, List<String> ids) { List<Wikitty> resultWS = ws.restore(securityToken, ids); List<Wikitty> resultTx = tx.restore(securityToken, ids); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/AbstractWikittyFileService.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -69,6 +69,7 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.collections.CollectionUtils; /** @@ -589,5 +590,28 @@ return null; } + @Override + public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion(String securityToken, Collection<String> extensionNames) { + List<WikittyExtension> result = new ArrayList<WikittyExtension>(); + + for (String extName : extensionNames) { + WikittyExtension ext = restoreExtensionLastVersion( + securityToken, extName); + if (ext != null) { + // on recherche les dependances de cette extension ... + List<String> requires = ext.getRequires(); + if (CollectionUtils.isNotEmpty(requires)) { + List<WikittyExtension> dependencies = + restoreExtensionAndDependenciesLastVesion( + securityToken, requires); + // ... et on les ajoute avant dans le resultat + result .addAll(dependencies); + } + result.add(ext); + } + } + return result; + } + } \ No newline at end of file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-11-09 16:36:07 UTC (rev 1252) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-11-19 17:14:39 UTC (rev 1253) @@ -43,6 +43,7 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; +import org.apache.commons.collections.CollectionUtils; /** * class meant to handle multicontext for wikitty publication. If want to use @@ -247,6 +248,29 @@ return result; } + @Override + public List<WikittyExtension> restoreExtensionAndDependenciesLastVesion(String securityToken, Collection<String> extensionNames) { + List<WikittyExtension> result = new ArrayList<WikittyExtension>(); + + for (String extName : extensionNames) { + WikittyExtension ext = restoreExtensionLastVersion( + securityToken, extName); + if (ext != null) { + // on recherche les dependances de cette extension ... + List<String> requires = ext.getRequires(); + if (CollectionUtils.isNotEmpty(requires)) { + List<WikittyExtension> dependencies = + restoreExtensionAndDependenciesLastVesion( + securityToken, requires); + // ... et on les ajoute avant dans le resultat + result .addAll(dependencies); + } + result.add(ext); + } + } + return result; + } + public List<Wikitty> restore(String securityToken, List<String> id) { List<Wikitty> result = new LinkedList<Wikitty>();

1 0

r1252 - trunk/wikitty-lucene
by bleny＠users.nuiton.org 09 Nov '11

09 Nov '11

Author: bleny Date: 2011-11-09 17:36:07 +0100 (Wed, 09 Nov 2011) New Revision: 1252 Url: http://nuiton.org/repositories/revision/wikitty/1252 Log: sometimes, it's fun to -Pwikitty-extra-modules Modified: trunk/wikitty-lucene/pom.xml Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-11-08 17:38:39 UTC (rev 1251) +++ trunk/wikitty-lucene/pom.xml 2011-11-09 16:36:07 UTC (rev 1252) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.3-SNAPSHOT</version> </parent>

1 0

r1251 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/main/java/org/nuiton/wikitty/search/operators wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 08 Nov '11

08 Nov '11

Author: bpoussin Date: 2011-11-08 18:38:39 +0100 (Tue, 08 Nov 2011) New Revision: 1251 Url: http://nuiton.org/repositories/revision/wikitty/1251 Log: Anomalie #1797: Change Search association implementation to work correctly Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/AssociatedRestriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/SubSearch.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-11-08 17:37:49 UTC (rev 1250) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2011-11-08 17:38:39 UTC (rev 1251) @@ -629,7 +629,8 @@ * @return sub query */ public Search associated(String foreignFieldName) { - Search search = new SubSearch(foreignFieldName, this); + Search search = new SubSearch(foreignFieldName); + subSearchs.add(search); return search; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/AssociatedRestriction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/AssociatedRestriction.java 2011-11-08 17:37:49 UTC (rev 1250) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/AssociatedRestriction.java 2011-11-08 17:38:39 UTC (rev 1251) @@ -28,21 +28,15 @@ private static final long serialVersionUID = 1L; - private Restriction associatedRestriction; - private Restriction embededRestriction; - private Element element; + protected Element element; + protected Restriction restriction; - public AssociatedRestriction(Restriction parentRestriction, Restriction embededRestriction, Element element) { - this.associatedRestriction = parentRestriction; - this.embededRestriction = embededRestriction; + public AssociatedRestriction(Element element, Restriction restriction) { + this.restriction = restriction; this.name = RestrictionName.ASSOCIATED; this.element = element; } - public Restriction getParentRestrictionDto() { - return associatedRestriction; - } - public Element getElement() { return element; } @@ -52,6 +46,6 @@ } public Restriction getRestriction() { - return embededRestriction; + return restriction; } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/SubSearch.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/SubSearch.java 2011-11-08 17:37:49 UTC (rev 1250) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/operators/SubSearch.java 2011-11-08 17:38:39 UTC (rev 1251) @@ -29,20 +29,16 @@ public class SubSearch extends Search { protected String foreignName; - protected Search parent; - public SubSearch(String foreignFieldName, Search search) { + public SubSearch(String foreignFieldName) { this.foreignName = foreignFieldName; - this.parent = search; } @Override protected Restriction getRestrictions() throws UnsupportedOperationException { return new AssociatedRestriction( - parent.criteria().getRestriction(), - super.getRestrictions(), - new Element(foreignName) - ); + new Element(foreignName), + super.getRestrictions()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java 2011-11-08 17:37:49 UTC (rev 1250) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java 2011-11-08 17:38:39 UTC (rev 1251) @@ -138,12 +138,6 @@ Assert.assertTrue( "Restriction is " + dto.getClass().getName(), embedded instanceof Equals ); checkRestriction(embedded, RestrictionName.EQUALS, "Category.name", "Hardware"); Assert.assertEquals( "Product.category", ass.getElement().getName() ); - Restriction parentRestriction = ass.getParentRestrictionDto(); - Assert.assertTrue( "Restriction is " + dto.getClass().getName(), parentRestriction instanceof And ); - And and = (And) parentRestriction; - Restriction[] dtos = and.getRestrictions().toArray(new Restriction[]{}); - Assert.assertTrue( dtos[0] instanceof Between ); - checkRestriction(dtos[1], RestrictionName.STARTS_WITH, "Product.name", "Paint"); } @Test Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-11-08 17:37:49 UTC (rev 1250) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-11-08 17:38:39 UTC (rev 1251) @@ -213,15 +213,7 @@ } generatedRestriction = new In(associated.getElement(), ids); } - Restriction parent = associated.getParentRestrictionDto(); - And and; - if ( parent instanceof And ) { - and = (And) parent; - and.getRestrictions().add( generatedRestriction ); - } else { - and = RestrictionHelper.and( Arrays.asList(new Restriction[]{ associated.getParentRestrictionDto(), generatedRestriction }) ); - } - return toSolr(and, solr); + return toSolr(generatedRestriction, solr); } private String not2solr(Not not, SolrServer solr) throws WikittyException { Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-11-08 17:37:49 UTC (rev 1250) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2011-11-08 17:38:39 UTC (rev 1251) @@ -262,13 +262,13 @@ @Test public void testAssociativeSearch() throws Exception { - Criteria criteria = Search.query() - .bw("Product.price", "15", "25") - .sw("Product.name", "Paint") - .associated( "Product.category") - .eq("Category.name", "Hardware") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + Search search = Search.query() + .bw("Product.price", "15", "25") + .sw("Product.name", "Paint"); + search.associated( "Product.category") + .eq("Category.name", "Hardware"); + Criteria criteria = search.criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); PagedResult<String> result = ws.findAllByCriteria(null, Collections.singletonList(criteria)).get(0); List<String> list = result.getAll();

1 0

r1250 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 08 Nov '11

08 Nov '11

Author: bpoussin Date: 2011-11-08 18:37:49 +0100 (Tue, 08 Nov 2011) New Revision: 1250 Url: http://nuiton.org/repositories/revision/wikitty/1250 Log: ajout javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-10-28 21:26:14 UTC (rev 1249) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2011-11-08 17:37:49 UTC (rev 1250) @@ -173,7 +173,10 @@ * * @param securityToken security token * @param wikittyId wikitty id - * @return vrai si l'utilisateur peut lire l'obbjet + * + * @return vrai si l'utilisateur peut lire l'obbjet. Si l'id est invalide + * alors on retourne false (l'utilisateur ne peut pas lire un objet qui + * n'existe pas) */ public boolean canRead(String securityToken, String wikittyId);

1 0