You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fm...@apache.org on 2013/03/30 18:32:56 UTC
svn commit: r1462809 - in
/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl:
JSONConverter.java XMLConverter.java
Author: fmui
Date: Sat Mar 30 17:32:56 2013
New Revision: 1462809
URL: http://svn.apache.org/r1462809
Log:
JSON and XML parser adjustments
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java?rev=1462809&r1=1462808&r2=1462809&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/JSONConverter.java Sat Mar 30 17:32:56 2013
@@ -415,15 +415,15 @@ public final class JSONConverter {
result.setChangesIncomplete(getBoolean(json, JSON_REPINFO_CHANGES_INCOMPLETE));
List<Object> changesOnType = getList(json.get(JSON_REPINFO_CHANGES_ON_TYPE));
- List<BaseTypeId> types = new ArrayList<BaseTypeId>();
if (changesOnType != null) {
+ List<BaseTypeId> types = new ArrayList<BaseTypeId>();
for (Object type : changesOnType) {
if (type != null) {
types.add(BaseTypeId.fromValue(type.toString()));
}
}
+ result.setChangesOnType(types);
}
- result.setChangesOnType(types);
result.setPrincipalAnonymous(getString(json, JSON_REPINFO_PRINCIPAL_ID_ANONYMOUS));
result.setPrincipalAnyone(getString(json, JSON_REPINFO_PRINCIPAL_ID_ANYONE));
Modified: chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java?rev=1462809&r1=1462808&r2=1462809&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/XMLConverter.java Sat Mar 30 17:32:56 2013
@@ -22,6 +22,7 @@ import static org.apache.chemistry.openc
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.HashSet;
@@ -1620,6 +1621,8 @@ public class XMLConverter {
result = new FolderTypeDefinitionImpl();
} else if (typeAttr.endsWith(ATTR_RELATIONSHIP_TYPE)) {
result = new RelationshipTypeDefinitionImpl();
+ ((RelationshipTypeDefinitionImpl) result).setAllowedSourceTypes(new ArrayList<String>());
+ ((RelationshipTypeDefinitionImpl) result).setAllowedTargetTypes(new ArrayList<String>());
} else if (typeAttr.endsWith(ATTR_POLICY_TYPE)) {
result = new PolicyTypeDefinitionImpl();
} else if (typeAttr.endsWith(ATTR_ITEM_TYPE)) {