mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
17717: This check-in contains changes in Java and .NET TCK tests related to CMIS-43 and CMIS-44 JIRA tasks. Also some bugs were faced out and fixed in 17727: CMIS-69: Alfresco to CMIS ACL mapping: Part 1: API 17732: Merge HEAD to DEV/CMIS10 17756: MOB-563: SQL Tests - Lexer 17764: CMIS-69: Alfresco to CMIS ACL mapping: get ACL support 17802: More for CMIS-69: Alfresco to CMIS ACL mapping. Implementation for applyAcl. 17830: Fixes for CMIS lexer and parser tests 17838: Access fix ups for access by the WS/Rest layers 17869: 1) remote-api: 17874: SAIL-146: Alfresco to CMIS ACL mapping: Support to group ACEs by principal id 17883: Adjust version properties for dev/cmis10 branch. 17885: Update OASIS CMIS TC status. 17889: Fix issue where objectid is not rendered correctly for CMIS private working copies. 17890: SAIL-146: Alfresco to CMIS ACL mapping: Fixes for ACL merging when reporting and ordering of ACEs. Report full permissions and not unique short names. 17902: Fix issue where CMIS queries via GET used incorrect defaults for paging. 17909: Fix CMIS link relations for folder tree. 17912: Fix CMIS type descendants atompub link 17922: Update AtomPub binding to CMIS 1.0 CD05 XSDs. 17924: SAIL-146: Alfresco to CMIS ACL mapping: Test set using full permissions (as opposed to short unique names) 17927: Fix content stream create/update status to comply with CMIS 1.0 CD05. 17934: Resolve encoding issues in CMIS AtomPub binding. 17973: SAIL-171: CMIS Renditions REST binding 17975: SAIL-146: Alfresco to CMIS ACL mapping: Completed AllowedAction and Permissions mapping. Added missing canDeleteTree. 17990: Update CMIS AtomPub to CD06 17996: Updates for cmis.alfresco.com for CD06 in prep for public review 2. 18007: WS-Bindings were updated with CMIS 1.0 cd06 changes. 18016: CMIS web services: Add missing generated files from WSDL 18018: CMIS index page updates for cmis.alfresco.com 18041: Merged HEAD to DEV/CMIS_10 18059: SAIL-227: 18067: SAIL-157: Strict vs Non-Strict Query Language: Enforce restrictions on the use of SCORE() and CONTAINS() 18080: Fix for SAIL-213:Bug: Query engine does not check that select list properties are valid for selectors 18131: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\'. 18132: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\': Fix underlying lucene impl for prefix and fuzzy queries to match wildcard/like 18143: SAIL-156: Query Language Compliance: Fix and check qualifiers in IN_TREE and IN_FOLDER. Improved scoring for CONTAINS() 18173: SAIL-245: Exclude thumbnails from normal query results 18179: SAIL 214: Query Language Compliance: Check for valid object ids in IN_FOLDER and IN_TREE 18210: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18211: SAIL-156: Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS. 18215: SAIL 156: Query Language Compliance: Fix CMIS type info to reflect the underlying settings of the Alfresco type for includeInSuperTypeQuery 18244: SAIL 156: Query Language Compliance: includeInSuperTypeQuery -> includedInSuperTypeQuery: First cut of cmis query test model. Fixed modelSchema.xml to validate 18255: SAIL 156: Query Language Compliance: First set of tests for predicates using properties mapped to CMIS Strings. 18261: CMIS-49 SAIL-163: Alfresco to CMIS Change Log mapping - New CMIS Audit mapping is implemented. ChangeLogDataExtractor was added. 18263: Build Fix 18285: SAIL 156: Query Language Compliance: Restrictions on predicates that may be used by single-valued and multi-valued properties 18287: SAIL-186: Changes to make CMIS Rendition REST bindings pass new TCK tests 18291: Fix Eclipse classpath problems 18323: CMIS-44 SAIL-187: Change Log tests (WS) – Java and .NET tests for change log were implemented. 18325: SAIL 156: Query Language Compliance: Fixes and tests for d:mltext mappings 18329: Updated Chemistry TCK jar including Dave W's rendition tests. 18333: Fix compile error - spurious imports. 18334: Fix issue where absurl web script method failed when deployed to root context. 18339: Update CMIS index page for start of public review 2. 18387: SAIL-147: CMIS ACL REST bindings + framework fixes 18392: Fix typo 18394: SAIL 156: Query Language Compliance: Fixes and tests for d:<numeric> 18406: SAIL 156: Query Language Compliance: Remaining type/predicate combinations. Restriction of In/Comparisons for ID/Boolean 18408: CMIS Query language - remove (pointless) multi-valued column from language definition 18409: Formatting change for CMIS.g 18410: Formatting change for FTS.g 18411: CMIS TCK tests were updated to CMIS 1.0 cd06 schemas. 18412: SAIL 156: Query Language Compliance: Tests and fixes for aliases for all data types in simple predicates (they behave as the direct column reference) 18417: Update Chemistry TCK which now incorporates Dave W's ACL tests. 18419: Update CMIS index page to include public review end date. 18427: SAIL 156: Query Language Compliance: Expose multi-valued properties in queries. Tests for all accessors. Fix content length to be long. 18435: SAIL 156: Query Language Compliance: Use queryable correctly and fix up model mappings. Add tests for baseTypeId, contentStreamId and path. 18472: SAIL 156: Query Language Compliance: Tests and fixes for FTS/Contains expressions. Adhere strictly to the spec - no extensions available by default. Improved FTS error reporting (and stop any recovery). 18477: SAIL-164: CMIS change log REST bindings 18495: SAIL 156: Query Language Compliance: Tests and fixes for escaping in string literals, LIKE and FTS expressions. 18537: SAIL 156: Query Language Compliance: Sorting support. Basic sort test for all orderable/indexed CMIS properties. 18538: SAIL-164: CMIS change log fixes for TCK compliance 18547: SAIL 156: Query Language Compliance: Ordering tests for all datatypes, including null values. 18582: Incorporate latest Chemistry TCK 18583: Update list of supported CMIS capabilities in index page. 18606: SAIL-156, SAIL-157, SAIL-158: Query Language Compliance: Respect all query options including locale. Fixes and tests for MLText cross language support. 18608: SAIL-159: Java / Javascript API access to CMIS Query Language 18617: SAIL-158: Query Tests: Check policy and relationship types are not queryable. 18636: SAIL-184: ACL tests (WS) 18663: ACL tests were updated in accordance with last requirements by David Caruana. 18680: Update to CMIS CD07 18681: Fix CMIS ContentStreamId property when document has no content. 18700: CMIS: Head merge problem resolution. Phase 1: Merge up to and including revision 18700, as this the point where both AtomPub and Web Services TCK tests succeed completely on dev branch. Note: includes CMIS rendition support ready for integration and testing with DM renditions. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
745 lines
28 KiB
Java
745 lines
28 KiB
Java
/*
|
|
* Copyright (C) 2005-2009 Alfresco Software Limited.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* 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 Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
* As a special exception to the terms and conditions of version 2.0 of
|
|
* the GPL, you may redistribute this Program in connection with Free/Libre
|
|
* and Open Source Software ("FLOSS") applications as described in Alfresco's
|
|
* FLOSS exception. You should have received a copy of the text describing
|
|
* the FLOSS exception, and it is also available here:
|
|
* http://www.alfresco.com/legal/licensing"
|
|
*/
|
|
package org.alfresco.repo.dictionary;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
|
|
import org.alfresco.service.cmr.dictionary.AspectDefinition;
|
|
import org.alfresco.service.cmr.dictionary.AssociationDefinition;
|
|
import org.alfresco.service.cmr.dictionary.ChildAssociationDefinition;
|
|
import org.alfresco.service.cmr.dictionary.ClassDefinition;
|
|
import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
|
|
import org.alfresco.service.cmr.dictionary.DictionaryException;
|
|
import org.alfresco.service.cmr.dictionary.ModelDefinition;
|
|
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
|
|
import org.alfresco.service.namespace.NamespacePrefixResolver;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.util.EqualsHelper;
|
|
|
|
|
|
/**
|
|
* Compiled Class Definition
|
|
*
|
|
* @author David Caruana
|
|
*/
|
|
/*package*/ class M2ClassDefinition implements ClassDefinition
|
|
{
|
|
protected ModelDefinition model;
|
|
protected M2Class m2Class;
|
|
protected QName name;
|
|
protected QName parentName = null;
|
|
|
|
private Map<QName, M2PropertyOverride> propertyOverrides = new HashMap<QName, M2PropertyOverride>();
|
|
private Map<QName, PropertyDefinition> properties = new HashMap<QName, PropertyDefinition>();
|
|
private Map<QName, PropertyDefinition> inheritedProperties = new HashMap<QName, PropertyDefinition>();
|
|
private Map<QName, AssociationDefinition> associations = new HashMap<QName, AssociationDefinition>();
|
|
private Map<QName, AssociationDefinition> inheritedAssociations = new HashMap<QName, AssociationDefinition>();
|
|
private Map<QName, ChildAssociationDefinition> inheritedChildAssociations = new HashMap<QName, ChildAssociationDefinition>();
|
|
private List<AspectDefinition> defaultAspects = new ArrayList<AspectDefinition>();
|
|
private List<QName> defaultAspectNames = new ArrayList<QName>();
|
|
private List<AspectDefinition> inheritedDefaultAspects = new ArrayList<AspectDefinition>();
|
|
private Set<QName> inheritedDefaultAspectNames = new HashSet<QName>();
|
|
private Boolean archive = null;
|
|
private Boolean inheritedArchive = null;
|
|
private Boolean includedInSuperTypeQuery = null;
|
|
private Boolean inheritedIncludedInSuperTypeQuery = null;
|
|
|
|
/**
|
|
* Construct
|
|
*
|
|
* @param m2Class class definition
|
|
* @param resolver namepsace resolver
|
|
* @param modelProperties global list of model properties
|
|
* @param modelAssociations global list of model associations
|
|
*/
|
|
/*package*/ M2ClassDefinition(ModelDefinition model, M2Class m2Class, NamespacePrefixResolver resolver, Map<QName, PropertyDefinition> modelProperties, Map<QName, AssociationDefinition> modelAssociations)
|
|
{
|
|
this.model = model;
|
|
this.m2Class = m2Class;
|
|
|
|
// Resolve Names
|
|
this.name = QName.createQName(m2Class.getName(), resolver);
|
|
this.archive = m2Class.getArchive();
|
|
this.includedInSuperTypeQuery = m2Class.getIncludedInSuperTypeQuery();
|
|
if (m2Class.getParentName() != null && m2Class.getParentName().length() > 0)
|
|
{
|
|
this.parentName = QName.createQName(m2Class.getParentName(), resolver);
|
|
}
|
|
|
|
// Construct Properties
|
|
for (M2Property property : m2Class.getProperties())
|
|
{
|
|
PropertyDefinition def = new M2PropertyDefinition(this, property, resolver);
|
|
if (properties.containsKey(def.getName()))
|
|
{
|
|
throw new DictionaryException("Found duplicate property definition " + def.getName().toPrefixString() + " within class " + name.toPrefixString());
|
|
}
|
|
|
|
// Check for existence of property elsewhere within the model
|
|
PropertyDefinition existingDef = modelProperties.get(def.getName());
|
|
if (existingDef != null)
|
|
{
|
|
// TODO: Consider sharing property, if property definitions are equal
|
|
throw new DictionaryException("Found duplicate property definition " + def.getName().toPrefixString() + " within class "
|
|
+ name.toPrefixString() + " and class " + existingDef.getContainerClass().getName().toPrefixString());
|
|
}
|
|
|
|
properties.put(def.getName(), def);
|
|
modelProperties.put(def.getName(), def);
|
|
}
|
|
|
|
// Construct Associations
|
|
for (M2ClassAssociation assoc : m2Class.getAssociations())
|
|
{
|
|
AssociationDefinition def;
|
|
if (assoc instanceof M2ChildAssociation)
|
|
{
|
|
def = new M2ChildAssociationDefinition(this, (M2ChildAssociation)assoc, resolver);
|
|
}
|
|
else
|
|
{
|
|
def = new M2AssociationDefinition(this, assoc, resolver);
|
|
}
|
|
if (associations.containsKey(def.getName()))
|
|
{
|
|
throw new DictionaryException("Found duplicate association definition " + def.getName().toPrefixString() + " within class " + name.toPrefixString());
|
|
}
|
|
|
|
// Check for existence of association elsewhere within the model
|
|
AssociationDefinition existingDef = modelAssociations.get(def.getName());
|
|
if (existingDef != null)
|
|
{
|
|
// TODO: Consider sharing association, if association definitions are equal
|
|
throw new DictionaryException("Found duplicate association definition " + def.getName().toPrefixString() + " within class "
|
|
+ name.toPrefixString() + " and class " + existingDef.getSourceClass().getName().toPrefixString());
|
|
}
|
|
|
|
associations.put(def.getName(), def);
|
|
modelAssociations.put(def.getName(), def);
|
|
}
|
|
|
|
// Construct Property overrides
|
|
for (M2PropertyOverride override : m2Class.getPropertyOverrides())
|
|
{
|
|
QName overrideName = QName.createQName(override.getName(), resolver);
|
|
if (properties.containsKey(overrideName))
|
|
{
|
|
throw new DictionaryException("Found duplicate property and property override definition " + overrideName.toPrefixString() + " within class " + name.toPrefixString());
|
|
}
|
|
if (propertyOverrides.containsKey(overrideName))
|
|
{
|
|
throw new DictionaryException("Found duplicate property override definition " + overrideName.toPrefixString() + " within class " + name.toPrefixString());
|
|
}
|
|
propertyOverrides.put(overrideName, override);
|
|
}
|
|
|
|
// Resolve qualified names
|
|
for (String aspectName : m2Class.getMandatoryAspects())
|
|
{
|
|
QName name = QName.createQName(aspectName, resolver);
|
|
if (!defaultAspectNames.contains(name))
|
|
{
|
|
defaultAspectNames.add(name);
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public String toString()
|
|
{
|
|
StringBuilder sb = new StringBuilder(120);
|
|
sb.append("ClassDef")
|
|
.append("[name=").append(name)
|
|
.append("]");
|
|
return sb.toString();
|
|
}
|
|
|
|
|
|
/*package*/ void resolveDependencies(
|
|
ModelQuery query,
|
|
NamespacePrefixResolver prefixResolver,
|
|
Map<QName, ConstraintDefinition> modelConstraints)
|
|
{
|
|
if (parentName != null)
|
|
{
|
|
ClassDefinition parent = query.getClass(parentName);
|
|
if (parent == null)
|
|
{
|
|
throw new DictionaryException("Parent class " + parentName.toPrefixString() + " of class " + name.toPrefixString() + " is not found");
|
|
}
|
|
}
|
|
|
|
for (PropertyDefinition def : properties.values())
|
|
{
|
|
((M2PropertyDefinition)def).resolveDependencies(query, prefixResolver, modelConstraints);
|
|
}
|
|
for (AssociationDefinition def : associations.values())
|
|
{
|
|
((M2AssociationDefinition)def).resolveDependencies(query);
|
|
}
|
|
|
|
for (Map.Entry<QName, M2PropertyOverride> override : propertyOverrides.entrySet())
|
|
{
|
|
PropertyDefinition propDef = query.getProperty(override.getKey());
|
|
if (propDef == null)
|
|
{
|
|
throw new DictionaryException("Class " + name.toPrefixString() + " attempting to override property " + override.getKey().toPrefixString() + " which does not exist");
|
|
}
|
|
}
|
|
|
|
for (QName aspectName : defaultAspectNames)
|
|
{
|
|
AspectDefinition aspect = query.getAspect(aspectName);
|
|
if (aspect == null)
|
|
{
|
|
throw new DictionaryException("Mandatory aspect " + aspectName.toPrefixString() + " of class " + name.toPrefixString() + " is not found");
|
|
}
|
|
defaultAspects.add(aspect);
|
|
}
|
|
}
|
|
|
|
|
|
/*package*/ void resolveInheritance(
|
|
ModelQuery query,
|
|
NamespacePrefixResolver prefixResolver,
|
|
Map<QName, ConstraintDefinition> modelConstraints)
|
|
{
|
|
// Retrieve parent class
|
|
ClassDefinition parentClass = (parentName == null) ? null : query.getClass(parentName);
|
|
|
|
// Build list of inherited properties (and process overridden values)
|
|
if (parentClass != null)
|
|
{
|
|
for (PropertyDefinition def : parentClass.getProperties().values())
|
|
{
|
|
M2PropertyOverride override = propertyOverrides.get(def.getName());
|
|
if (override == null)
|
|
{
|
|
inheritedProperties.put(def.getName(), def);
|
|
}
|
|
else
|
|
{
|
|
inheritedProperties.put(
|
|
def.getName(),
|
|
new M2PropertyDefinition(this, def, override, prefixResolver, modelConstraints));
|
|
}
|
|
}
|
|
}
|
|
|
|
// Append list of defined properties
|
|
for (PropertyDefinition def : properties.values())
|
|
{
|
|
if (inheritedProperties.containsKey(def.getName()))
|
|
{
|
|
throw new DictionaryException("Duplicate property definition " + def.getName().toPrefixString() + " found in class hierarchy of " + name.toPrefixString());
|
|
}
|
|
inheritedProperties.put(def.getName(), def);
|
|
}
|
|
|
|
// Build list of inherited associations
|
|
if (parentClass != null)
|
|
{
|
|
inheritedAssociations.putAll(parentClass.getAssociations());
|
|
}
|
|
|
|
// Append list of defined associations
|
|
for (AssociationDefinition def : associations.values())
|
|
{
|
|
if (inheritedAssociations.containsKey(def.getName()))
|
|
{
|
|
throw new DictionaryException("Duplicate association definition " + def.getName().toPrefixString() + " found in class hierarchy of " + name.toPrefixString());
|
|
}
|
|
inheritedAssociations.put(def.getName(), def);
|
|
}
|
|
|
|
// Derive Child Associations
|
|
for (AssociationDefinition def : inheritedAssociations.values())
|
|
{
|
|
if (def instanceof ChildAssociationDefinition)
|
|
{
|
|
inheritedChildAssociations.put(def.getName(), (ChildAssociationDefinition)def);
|
|
}
|
|
}
|
|
|
|
// Build list of inherited default aspects
|
|
if (parentClass != null)
|
|
{
|
|
inheritedDefaultAspects.addAll(parentClass.getDefaultAspects());
|
|
}
|
|
|
|
// Append list of defined default aspects
|
|
for (AspectDefinition def : defaultAspects)
|
|
{
|
|
if (!inheritedDefaultAspects.contains(def))
|
|
{
|
|
inheritedDefaultAspects.add(def);
|
|
}
|
|
}
|
|
|
|
// Convert to set of names
|
|
for (AspectDefinition aspDef : inheritedDefaultAspects)
|
|
{
|
|
inheritedDefaultAspectNames.add(aspDef.getName());
|
|
}
|
|
|
|
// resolve archive inheritance
|
|
if (parentClass != null && archive == null)
|
|
{
|
|
// archive not explicitly set on this class and there is a parent class
|
|
inheritedArchive = ((M2ClassDefinition)parentClass).getArchive();
|
|
}
|
|
|
|
// resolve includedInSuperTypeQuery inheritance
|
|
if (parentClass != null && includedInSuperTypeQuery == null)
|
|
{
|
|
// archive not explicitly set on this class and there is a parent class
|
|
inheritedIncludedInSuperTypeQuery = ((M2ClassDefinition)parentClass).getIncludedInSuperTypeQuery();
|
|
}
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#getModel()
|
|
*/
|
|
public ModelDefinition getModel()
|
|
{
|
|
return model;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#getName()
|
|
*/
|
|
public QName getName()
|
|
{
|
|
return name;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#getTitle()
|
|
*/
|
|
public String getTitle()
|
|
{
|
|
String value = M2Label.getLabel(model, "class", name, "title");
|
|
if (value == null)
|
|
{
|
|
value = m2Class.getTitle();
|
|
}
|
|
return value;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#getDescription()
|
|
*/
|
|
public String getDescription()
|
|
{
|
|
String value = M2Label.getLabel(model, "class", name, "description");
|
|
if (value == null)
|
|
{
|
|
value = m2Class.getDescription();
|
|
}
|
|
return value;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#getParentName()
|
|
*/
|
|
public QName getParentName()
|
|
{
|
|
return parentName;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#isAspect()
|
|
*/
|
|
public boolean isAspect()
|
|
{
|
|
return (m2Class instanceof M2Aspect);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#getArchive()
|
|
*/
|
|
public Boolean getArchive()
|
|
{
|
|
return archive == null ? inheritedArchive : archive;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#includedInSuperTypeQuery()
|
|
*/
|
|
public Boolean getIncludedInSuperTypeQuery()
|
|
{
|
|
if(includedInSuperTypeQuery != null)
|
|
{
|
|
return includedInSuperTypeQuery;
|
|
}
|
|
if(inheritedIncludedInSuperTypeQuery != null)
|
|
{
|
|
return inheritedIncludedInSuperTypeQuery;
|
|
}
|
|
return Boolean.TRUE;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#getProperties()
|
|
*/
|
|
public Map<QName, PropertyDefinition> getProperties()
|
|
{
|
|
return Collections.unmodifiableMap(inheritedProperties);
|
|
}
|
|
|
|
/**
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#getDefaultValues()
|
|
*/
|
|
public Map<QName, Serializable> getDefaultValues()
|
|
{
|
|
Map<QName, Serializable> result = new HashMap<QName, Serializable>(5);
|
|
|
|
for(Map.Entry<QName, PropertyDefinition> entry : inheritedProperties.entrySet())
|
|
{
|
|
PropertyDefinition propertyDefinition = entry.getValue();
|
|
String defaultValue = propertyDefinition.getDefaultValue();
|
|
if (defaultValue != null)
|
|
{
|
|
result.put(entry.getKey(), defaultValue);
|
|
}
|
|
}
|
|
|
|
return Collections.unmodifiableMap(result);
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#getAssociations()
|
|
*/
|
|
public Map<QName, AssociationDefinition> getAssociations()
|
|
{
|
|
return Collections.unmodifiableMap(inheritedAssociations);
|
|
}
|
|
|
|
/**
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#getDefaultAspects()
|
|
*/
|
|
public List<AspectDefinition> getDefaultAspects()
|
|
{
|
|
return inheritedDefaultAspects;
|
|
}
|
|
|
|
/**
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#getDefaultAspects(boolean)
|
|
*/
|
|
public List<AspectDefinition> getDefaultAspects(boolean inherited)
|
|
{
|
|
return inherited ? getDefaultAspects() : defaultAspects;
|
|
}
|
|
|
|
/**
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#getDefaultAspectNames()
|
|
*/
|
|
public Set<QName> getDefaultAspectNames()
|
|
{
|
|
return inheritedDefaultAspectNames;
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.service.cmr.dictionary.ClassDefinition#isContainer()
|
|
*/
|
|
public boolean isContainer()
|
|
{
|
|
return !inheritedChildAssociations.isEmpty();
|
|
}
|
|
|
|
/* (non-Javadoc)
|
|
* @see org.alfresco.repo.dictionary.ClassDefinition#getChildAssociations()
|
|
*/
|
|
public Map<QName, ChildAssociationDefinition> getChildAssociations()
|
|
{
|
|
return Collections.unmodifiableMap(inheritedChildAssociations);
|
|
}
|
|
|
|
@Override
|
|
public int hashCode()
|
|
{
|
|
return name.hashCode();
|
|
}
|
|
|
|
@Override
|
|
public boolean equals(Object obj)
|
|
{
|
|
if (!(obj instanceof M2ClassDefinition))
|
|
{
|
|
return false;
|
|
}
|
|
return name.equals(((M2ClassDefinition)obj).name);
|
|
}
|
|
|
|
/**
|
|
* return differences in class definition
|
|
*
|
|
* note:
|
|
* - checks properties for incremental updates, but does not include the diffs
|
|
* - checks assocs & child assocs for incremental updates, but does not include the diffs
|
|
* - incremental updates include changes in title/description, property default value, etc
|
|
*/
|
|
/* package */ List<M2ModelDiff> diffClass(ClassDefinition classDef)
|
|
{
|
|
List<M2ModelDiff> modelDiffs = new ArrayList<M2ModelDiff>();
|
|
boolean isUpdated = false;
|
|
boolean isUpdatedIncrementally = false;
|
|
|
|
if (this == classDef)
|
|
{
|
|
return modelDiffs;
|
|
}
|
|
|
|
// check name - cannot be null
|
|
if (! name.equals(classDef.getName()))
|
|
{
|
|
isUpdated = true;
|
|
}
|
|
|
|
// check title
|
|
if (! EqualsHelper.nullSafeEquals(getTitle(), classDef.getTitle(), false))
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
|
|
// check description
|
|
if (! EqualsHelper.nullSafeEquals(getDescription(), classDef.getDescription(), false))
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
|
|
// check parent name
|
|
if (parentName != null)
|
|
{
|
|
if (! parentName.equals(classDef.getParentName()))
|
|
{
|
|
isUpdated = true;
|
|
}
|
|
}
|
|
else if (classDef.getParentName() != null)
|
|
{
|
|
isUpdated = true;
|
|
}
|
|
|
|
// check if aspect (or type)
|
|
if (isAspect() != classDef.isAspect())
|
|
{
|
|
isUpdated = true;
|
|
}
|
|
|
|
// check if container
|
|
if (isContainer() != classDef.isContainer())
|
|
{
|
|
if (isContainer())
|
|
{
|
|
// updated (non-incrementally) if class was a container and now is not a container - ie. all child associations removed
|
|
isUpdated = true;
|
|
}
|
|
|
|
if (classDef.isContainer())
|
|
{
|
|
// updated incrementally if class was not a container and now is a container - ie. some child associations added
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
}
|
|
|
|
// check all properties (including inherited properties)
|
|
Collection<M2ModelDiff> propertyDiffs = M2PropertyDefinition.diffPropertyLists(getProperties().values(), classDef.getProperties().values());
|
|
|
|
for (M2ModelDiff propertyDiff : propertyDiffs)
|
|
{
|
|
// note: incremental property updates not supported yet, added for completeness
|
|
if (propertyDiff.getDiffType().equals(M2ModelDiff.DIFF_CREATED) || propertyDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED_INC))
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
|
|
if (propertyDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED) || propertyDiff.getDiffType().equals(M2ModelDiff.DIFF_DELETED))
|
|
{
|
|
isUpdated = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
// check all associations (including inherited associations, child associations and inherited child associations)
|
|
Collection<M2ModelDiff> assocDiffs = M2AssociationDefinition.diffAssocLists(getAssociations().values(), classDef.getAssociations().values());
|
|
|
|
for (M2ModelDiff assocDiff : assocDiffs)
|
|
{
|
|
// note: incremental association updates not supported yet, added for completeness
|
|
if (assocDiff.getDiffType().equals(M2ModelDiff.DIFF_CREATED) || assocDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED_INC))
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
|
|
if (assocDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED) || assocDiff.getDiffType().equals(M2ModelDiff.DIFF_DELETED))
|
|
{
|
|
isUpdated = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
// check default/mandatory aspects (including inherited default aspects)
|
|
Collection<M2ModelDiff> defaultAspectsDiffs = M2ClassDefinition.diffClassLists(new ArrayList<ClassDefinition>(getDefaultAspects()), new ArrayList<ClassDefinition>(classDef.getDefaultAspects()), M2ModelDiff.TYPE_DEFAULT_ASPECT);
|
|
|
|
for (M2ModelDiff defaultAspectDiff : defaultAspectsDiffs)
|
|
{
|
|
// note: incremental default/mandatory aspect updates not supported yet, added for completeness
|
|
if (defaultAspectDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED_INC))
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
|
|
if (defaultAspectDiff.getDiffType().equals(M2ModelDiff.DIFF_CREATED) || defaultAspectDiff.getDiffType().equals(M2ModelDiff.DIFF_UPDATED) || defaultAspectDiff.getDiffType().equals(M2ModelDiff.DIFF_DELETED))
|
|
{
|
|
isUpdated = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
// check archive/inheritedArchive
|
|
if (archive == null)
|
|
{
|
|
if (classDef.getArchive() != null)
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Boolean classArchive = classDef.getArchive();
|
|
if (classArchive == null || classArchive.booleanValue() != archive.booleanValue())
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
}
|
|
|
|
// check includedInSuperTypeQuery/inheritedIncludedInSuperTypeQuery
|
|
if (includedInSuperTypeQuery == null)
|
|
{
|
|
if (classDef.getIncludedInSuperTypeQuery() != null)
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Boolean classIncludedInSuperTypeQuery = classDef.getIncludedInSuperTypeQuery();
|
|
if (classIncludedInSuperTypeQuery == null || classIncludedInSuperTypeQuery.booleanValue() != includedInSuperTypeQuery.booleanValue())
|
|
{
|
|
isUpdatedIncrementally = true;
|
|
}
|
|
}
|
|
|
|
String modelDiffType;
|
|
if (isAspect())
|
|
{
|
|
modelDiffType = M2ModelDiff.TYPE_ASPECT;
|
|
}
|
|
else
|
|
{
|
|
modelDiffType = M2ModelDiff.TYPE_TYPE;
|
|
}
|
|
|
|
if (isUpdated)
|
|
{
|
|
modelDiffs.add(new M2ModelDiff(name, modelDiffType, M2ModelDiff.DIFF_UPDATED));
|
|
}
|
|
else if (isUpdatedIncrementally)
|
|
{
|
|
modelDiffs.add(new M2ModelDiff(name, modelDiffType, M2ModelDiff.DIFF_UPDATED_INC));
|
|
}
|
|
else
|
|
{
|
|
for (M2ModelDiff modelDiff : modelDiffs)
|
|
{
|
|
if (! modelDiff.getDiffType().equals(M2ModelDiff.DIFF_UNCHANGED))
|
|
{
|
|
throw new DictionaryException("Unexpected: diff found although '" + name + "' not marked as updated");
|
|
}
|
|
}
|
|
modelDiffs.add(new M2ModelDiff(name, modelDiffType, M2ModelDiff.DIFF_UNCHANGED));
|
|
}
|
|
|
|
return modelDiffs;
|
|
}
|
|
|
|
/**
|
|
* return differences in class definition lists
|
|
*
|
|
*/
|
|
/*package*/ static List<M2ModelDiff> diffClassLists(Collection<ClassDefinition> previousClasses, Collection<ClassDefinition> newClasses, String M2ModelDiffType)
|
|
{
|
|
List<M2ModelDiff> modelDiffs = new ArrayList<M2ModelDiff>();
|
|
|
|
for (ClassDefinition previousClass : previousClasses)
|
|
{
|
|
boolean found = false;
|
|
for (ClassDefinition newClass : newClasses)
|
|
{
|
|
if (newClass.getName().equals(previousClass.getName()))
|
|
{
|
|
modelDiffs.addAll(((M2ClassDefinition)previousClass).diffClass(newClass));
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (! found)
|
|
{
|
|
modelDiffs.add(new M2ModelDiff(previousClass.getName(), M2ModelDiffType, M2ModelDiff.DIFF_DELETED));
|
|
}
|
|
}
|
|
|
|
for (ClassDefinition newClass : newClasses)
|
|
{
|
|
boolean found = false;
|
|
for (ClassDefinition previousClass : previousClasses)
|
|
{
|
|
if (newClass.getName().equals(previousClass.getName()))
|
|
{
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (! found)
|
|
{
|
|
modelDiffs.add(new M2ModelDiff(newClass.getName(), M2ModelDiffType, M2ModelDiff.DIFF_CREATED));
|
|
}
|
|
}
|
|
|
|
return modelDiffs;
|
|
}
|
|
}
|