Author: bpoussin Date: 2011-05-24 02:12:31 +0200 (Tue, 24 May 2011) New Revision: 914 Url: http://nuiton.org/repositories/revision/wikitty/914 Log: - hasField never throw exception but return false - add getFieldValue method on Wikitty to return unmodifable Map of field value Modified: 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 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-05-23 16:16:03 UTC (rev 913) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2011-05-24 00:12:31 UTC (rev 914) @@ -30,6 +30,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; public interface Wikitty extends Cloneable, Serializable { @@ -206,6 +207,12 @@ Set<String> fieldNames(); /** + * All field value in unmodifiable map + * @return + */ + Map<String, Object> getFieldValue(); + + /** * Return all fieldName available in all extension * @return * 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-05-23 16:16:03 UTC (rev 913) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2011-05-24 00:12:31 UTC (rev 914) @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -350,6 +351,11 @@ } @Override + public Map<String, Object> getFieldValue() { + return target.getFieldValue(); + } + + @Override public Set<String> getAllFieldNames() { return target.getAllFieldNames(); } 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-05-23 16:16:03 UTC (rev 913) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2011-05-24 00:12:31 UTC (rev 914) @@ -32,6 +32,7 @@ import java.util.AbstractSet; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -367,10 +368,15 @@ @Override public boolean hasField(String fqfieldName) { - String extName = WikittyExtension.extractExtensionName(fqfieldName); - String fieldName = WikittyExtension.extractFieldName(fqfieldName); + boolean result = false; + try { + String extName = WikittyExtension.extractExtensionName(fqfieldName); + String fieldName = WikittyExtension.extractFieldName(fqfieldName); - boolean result = hasField(extName, fieldName); + result = hasField(extName, fieldName); + } catch (Exception eee) { + log.trace("Invalide field name is never field", eee); + } return result; } @@ -861,6 +867,11 @@ } @Override + public Map<String, Object> getFieldValue() { + return Collections.unmodifiableMap(fieldValue); + } + + @Override public Set<String> getAllFieldNames() { Set<String> result = new HashSet<String>(); for (WikittyExtension ext : getExtensions()) {