Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:

20678: DAO5 branch: Preparation for merge back to HEAD 20689: Merged DAO4 to DAO5 - Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect' DB create scripts are taken from latest DAO4 - TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO Merged DAO3 to DAO4 - Reapplied fixes for ALF-713 (race condition on Usages) 19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3: 18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898 18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2 18202: Dev branch for DAO refactor 18252: SAIL-233: QName.hbm.xml 18295: Added missing CREATE TABLE statements for QName-related code 18324: SAIL-234: Node.hbm.xml: Node aspects initial integration 18355: Added 'setValue' method to manually update the cached value 18356: MV property stressing lowered to speed test up 18357: SAIL-234: Node.hbm.xml 18376: Pulled all Alfresco-related create SQL into script 18389: SAIL-234: Permissions DAO refactor - initial checkpoint 18390: Formatting only (line-endings) 18400: SAIL-234: Node.hbm.xml 18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD 18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl 18457: SAIL-234: Permissions DAO refactor 18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode) 18482: SAIL-235: remove Permissions.hbm.xml 18517: SAIL-235: Permissions DAO refactor 18523: SAIL-234: Node.hbm.xml 18524: SAIL-235: Permissions DAO refactor 18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18533: Flipped back to Windows line endings 18535: Formatting-only (eol) 18540: Formatting-only (eol) 18541: SAIL-235: Permissions DAO refactor 18543: SAIL-234: Node.hbm.xml: Start alf_store changes 18567: SAIL-235: Permissions DAO refactor 18596: SAIL-305: Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints 18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3) 18604: SAIL-311: Remove empty dirs 18619: SAIL-274: Locale.hbm.xml 18621: Added method to create default ACL 18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node 18624: Formatting only (eol) 18631: SAIL-235: Permissions DAO refactor 18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused 18639: getLocale(Locale) should return null if it doesn't exist 18640: SAIL-234 NodeDAO: More replacement of node queries and updates 18648: SAIL-310: Create SQL script for core repo tables (All DB ports) 18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes 18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18658: SAIL-274 Locale DAO: Missing getValueKey() method 18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs) 18664: DB scripts porting for PostgreSQL finished. 18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes 18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes 18672: DB scripts porting for Oracle finished. 18675: SAIL-235: Permissions DAO refactor 18677: DB scripts porting for DB2 finished. 18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18687: Execute a callback with retries 18688: SAIL-234 Node DAO: Child association creation 18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks 18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling 18713: Commented about needing a more efficient removeChildAssociation method 18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc 18715: SAIL-234 Node DAO: More alf_child_assoc query replacement 18727: SAIL-234 Node DAO: alf_child_assoc queries complete 18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths 18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO 18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest) 18769: SAIL-234 Node DAO: alf_node_properties ground work 18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties 18810: Added EqualsHelper.getMapComparison 18813: TransactionalCache propagates cache clears and removals during rollback 18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO 18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property) 18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService' 18895: SAIL-234 NodeDAO: Queries for alf_transaction 18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO' 18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries 18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates 18922: SAIL-235: DAO refactoring: Permission.hbm.xml 18930: SAIL-235: DAO refactoring: Permission.hbm.xml 18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming 18933: SAIL-234 NodeDAO: Minor neatening 18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef 18936: EHCache config files line endings 18938: SAIL-237: Usage DAO refactor - initial checkpoint 18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node. 18975: Fix for move-node ACL jiggery-pokery 19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure) 19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion 19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting 19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s) 19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only) 19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2 18973: Temporarily comment out AVMTestSuite and run AVM tests individually 19056: AVM unit test improvements 19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node. 19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern 19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache 19302: SAIL-234 Node DAO: Added cache for node properties 19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern 20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5: 20063: (RECORD ONLY) DAO refactor branch V4 20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache) 19428: Fixed TransactionalCache issue with null and NullValueMarker 19429: Took empty cm:content creation out of FileFolderService#createImpl 19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable 19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed 19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update 19475: Allow debugging of code without stepping into trivial stuff 19476: Follow-up on 19429 by ensuring CIFS/FTP set a mimetype on the ContentWriter 19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties 19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs) 19479: SAIL-234 Node DAO: Fixed for parent association and property caches 19480: Made TransactionAwareSingleton bind-key a GUID 19481: SAIL-234 Node DAO: Reinstated 100K collection property tests 19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests 19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation 19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf) 20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433 19621: (RECORD ONLY) SAIL-347 19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347 19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721 20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3 19739: Extended "move" tests 19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance) 19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3 19367: Merged BRANCHES/V3.2 to HEAD: 19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException" 19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs) 20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5: - Retired all 1.3 and 1.4 upgrade scripts ... R.I.P. - Fixed CRC patch for Authorities (only tested on MySQL) - Fixed SQL patch revision numbers and bumped version schema number up 20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347 19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3 19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test 20183: Merged DAO3 to DAO4 19852: SAIL-370: Remove LinkValidation 19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context 19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235) 19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API 19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API 20208: DAO-refactor implementation of ALF-2712 query improvements 20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 20060: Removal of AttributeService for SAIL-239 (SAIL-294) 20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval 20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes 20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout 20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) 20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE 20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals) 20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner) 20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl) 20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.* 20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test) 20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.* 20626: Fixed random keys for RuleTrigger NodeRef tracking 20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates 20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest 20643: Removed must of the 'distribute' target's dependencies. Not for HEAD 20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies. Not for HEAD) 20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects) 20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup) 20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null) 20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 20090: Dynamic models: minor improvements to DictionaryModelType 20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService) 20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead) 20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.* 20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060) 20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner 20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2010-06-17 19:35:49 +00:00
parent 6e928249a5
commit 4872eb9909
470 changed files with 39121 additions and 44771 deletions
--- a/source/java/org/alfresco/repo/attributes/AttributeServiceImpl.java
+++ b/source/java/org/alfresco/repo/attributes/AttributeServiceImpl.java
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (C) 2005-2010 Alfresco Software Limited.
 *
 * This file is part of Alfresco
@@ -14,658 +14,272 @@
 * GNU Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.alfresco.repo.attributes;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.repo.attributes.Attribute.Type;
-import org.alfresco.service.cmr.attributes.AttrQuery;
-import org.alfresco.service.cmr.attributes.AttributeService;
-import org.alfresco.service.cmr.avm.AVMBadArgumentException;
-import org.alfresco.service.cmr.avm.AVMNotFoundException;
-import org.alfresco.service.cmr.avm.AVMWrongTypeException;
-import org.alfresco.util.Pair;
-
-/**
- * Implementation of the AttributeService interface.
- * @author britt
- */
-public class AttributeServiceImpl implements AttributeService
-{
-    private GlobalAttributeEntryDAO fGlobalAttributeEntryDAO;
-
-    private AttributeDAO fAttributeDAO;
-
-    private AttributeConverter fAttributeConverter;
-
-    public AttributeServiceImpl()
-    {
-    }
-
-    public void setGlobalAttributeEntryDao(GlobalAttributeEntryDAO dao)
-    {
-        fGlobalAttributeEntryDAO = dao;
-    }
-
-    public void setAttributeDao(AttributeDAO dao)
-    {
-        fAttributeDAO = dao;
-    }
-
-    public void setAttributeConverter(AttributeConverter converter)
-    {
-        fAttributeConverter = converter;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#getAttribute(java.lang.String)
-     */
-    public Attribute getAttribute(String path)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Null path.");
-        }
-        List<String> keys = parsePath(path);
-        return getAttribute(keys);
-    }
-
-    /**
-     * Utility to parse paths.  Paths are of the form '/name/name'. '\' can
-     * be used to escape '/'s.
-     * @param path The path to parse.
-     * @return The components of the path.
-     */
-    private List<String> parsePath(String path)
-    {
-        List<String> components = new ArrayList<String>();
-        int off = 0;
-        while (off < path.length())
-        {
-            while (off < path.length() && path.charAt(off) == '/')
-            {
-                off++;
-            }
-            StringBuilder builder = new StringBuilder();
-            while (off < path.length())
-            {
-                char c = path.charAt(off);
-                if (c == '/')
-                {
-                    break;
-                }
-                if (c == '\\')
-                {
-                    off++;
-                    if (off >= path.length())
-                    {
-                        break;
-                    }
-                    c = path.charAt(off);
-                }
-                builder.append(c);
-                off++;
-            }
-            components.add(builder.toString());
-        }
-        return components;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#query(java.lang.String, org.alfresco.service.cmr.attributes.AttrQuery)
-     */
-    public List<Pair<String, Attribute>> query(String path, AttrQuery query)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Null Attribute Path.");
-        }
-        List<String> keys = parsePath(path);
-        return query(keys, query);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#removeAttribute(java.lang.String)
-     */
-    public void removeAttribute(String path, String name)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Null Attribute Path.");
-        }
-        List<String> keys = parsePath(path);
-        removeAttribute(keys, name);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#setAttribute(java.lang.String, org.alfresco.repo.attributes.Attribute)
-     */
-    public void setAttribute(String path, String name, Attribute value)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Null path.");
-        }
-        List<String> keys = parsePath(path);
-        setAttribute(keys, name, value);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#getKeys(java.lang.String)
-     */
-    public List<String> getKeys(String path)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Null Attribute Path.");
-        }
-        List<String> keys = parsePath(path);
-        return getKeys(keys);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#getAttribute(java.util.List)
-     */
-    public Attribute getAttribute(List<String> keys)
-    {
-        if (keys == null)
-        {
-            throw new AVMBadArgumentException("Null Attribute Path List.");
-        }
-        if (keys.size() < 1)
-        {
-            throw new AVMBadArgumentException("Bad Attribute Path List.");
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            return null;
-        }
-        Attribute converted = fAttributeConverter.toValue(found);
-        return converted;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#getKeys(java.util.List)
-     */
-    public List<String> getKeys(List<String> keys)
-    {
-        if (keys == null)
-        {
-            throw new AVMBadArgumentException("Null Keys List.");
-        }
-        if (keys.size() == 0)
-        {
-            return fGlobalAttributeEntryDAO.getKeys();
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.MAP)
-        {
-            throw new AVMWrongTypeException("Not a Map: " + keys.get(keys.size() - 1));
-        }
-        return new ArrayList<String>(found.keySet());
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#setAttribute(java.util.List, java.lang.String, org.alfresco.repo.attributes.Attribute)
-     */
-    public void setAttribute(List<String> keys, String name, Attribute value)
-    {
-        if (keys == null || name == null || value == null)
-        {
-            throw new AVMBadArgumentException("Null argument.");
-        }
-        if (keys.size() == 0)
-        {
-            Attribute toSave = fAttributeConverter.toPersistent(value);
-            GlobalAttributeEntry found = fGlobalAttributeEntryDAO.get(name);
-            if (found == null)
-            {
-                found = new GlobalAttributeEntryImpl(name, toSave);
-                fGlobalAttributeEntryDAO.save(found);
-                return;
-            }
-            found.setAttribute(toSave);
-            return;
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.MAP)
-        {
-            throw new AVMWrongTypeException("Not a Map: " + keys);
-        }
-        Attribute converted = fAttributeConverter.toPersistent(value);
-        found.put(name, converted);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#query(java.util.List, org.alfresco.service.cmr.attributes.AttrQuery)
-     */
-    public List<Pair<String, Attribute>> query(List<String> keys, AttrQuery query)
-    {
-        if (keys == null || query == null)
-        {
-            throw new AVMBadArgumentException("Null argument.");
-        }
-        if (keys.size() == 0)
-        {
-            throw new AVMBadArgumentException("Cannot query top level Attributes.");
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.MAP)
-        {
-            throw new AVMWrongTypeException("Not a Map: " + keys);
-        }
-        List<Pair<String, Attribute>> rawResult =
-            fAttributeDAO.find((MapAttribute)found, query);
-        List<Pair<String, Attribute>> result =
-            new ArrayList<Pair<String, Attribute>>();
-        for (Pair<String, Attribute> raw : rawResult)
-        {
-            result.add(new Pair<String, Attribute>(raw.getFirst(),
-                                                   fAttributeConverter.toValue(raw.getSecond())));
-        }
-        return result;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#removeAttribute(java.util.List, java.lang.String)
-     */
-    public void removeAttribute(List<String> keys, String name)
-    {
-        if (keys == null || name == null)
-        {
-            throw new AVMBadArgumentException("Null argument.");
-        }
-        if (keys.size() == 0)
-        {
-            fGlobalAttributeEntryDAO.delete(name);
-            return;
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.MAP)
-        {
-            throw new AVMWrongTypeException("Attribute Not Map: " + keys);
-        }
-        found.remove(name);
-        fAttributeDAO.flush();
-        fAttributeDAO.evictFlat(found);
-    }
-
-    private Attribute getAttributeFromPath(List<String> keys)
-    {
-        GlobalAttributeEntry entry = fGlobalAttributeEntryDAO.get(keys.get(0));
-        if (entry == null)
-        {
-            return null;
-        }
-        Attribute current = entry.getAttribute();
-        for (int i = 1; i < keys.size(); i++)
-        {
-            if (current.getType() == Type.MAP)
-            {
-                Attribute newCurrent = current.get(keys.get(i));
-                fAttributeDAO.evictFlat(current);
-                current = newCurrent;
-            }
-            else if (current.getType() == Type.LIST)
-            {
-                Attribute newCurrent = current.get(Integer.parseInt(keys.get(i)));
-                fAttributeDAO.evictFlat(current);
-                current = newCurrent;
-            }
-            else
-            {
-                throw new AVMWrongTypeException("Not a Map or List: " + keys.get(i - 1));
-            }
-            if (current == null)
-            {
-                return null;
-            }
-        }
-        return current;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#addAttribute(java.util.List, org.alfresco.repo.attributes.Attribute)
-     */
-    public void addAttribute(List<String> keys, Attribute value)
-    {
-        if (keys == null || value == null)
-        {
-            throw new AVMBadArgumentException("Illegal Null Argument.");
-        }
-        if (keys.size() < 1)
-        {
-            throw new AVMBadArgumentException("Path too short: " + keys);
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.LIST)
-        {
-            throw new AVMWrongTypeException("Attribute Not List: " + keys);
-        }
-        found.add(fAttributeConverter.toPersistent(value));
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#addAttribute(java.lang.String, org.alfresco.repo.attributes.Attribute)
-     */
-    public void addAttribute(String path, Attribute value)
-    {
-        if (path == null || value == null)
-        {
-            throw new AVMBadArgumentException("Illegal null arguments.");
-        }
-        List<String> keys = parsePath(path);
-        addAttribute(keys, value);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#removeAttribute(java.util.List, int)
-     */
-    public void removeAttribute(List<String> keys, int index)
-    {
-        if (keys == null)
-        {
-            throw new AVMBadArgumentException("Illegal Null Keys.");
-        }
-        if (keys.size() < 1)
-        {
-            throw new AVMBadArgumentException("Keys too short: " + keys);
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.LIST)
-        {
-            throw new AVMWrongTypeException("Attribute Not List: " + keys);
-        }
-        found.remove(index);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#removeAttribute(java.lang.String, int)
-     */
-    public void removeAttribute(String path, int index)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Illegal null path.");
-        }
-        List<String> keys = parsePath(path);
-        removeAttribute(keys, index);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#removeEntries(java.util.List, org.alfresco.service.cmr.attributes.AttrQuery)
-     */
-    public void removeEntries(List<String> keys, AttrQuery query)
-    {
-        if (keys == null || query == null)
-        {
-            throw new AVMBadArgumentException("Illegal null argument.");
-        }
-        if (keys.size() == 0)
-        {
-            throw new AVMBadArgumentException("Illegal zero length key path.");
-        }
-        Attribute map = getAttributeFromPath(keys);
-        if (map == null)
-        {
-            throw new AVMNotFoundException("Could not find attribute: " + keys);
-        }
-        if (map.getType() != Attribute.Type.MAP)
-        {
-            throw new AVMWrongTypeException("Not a map: " + keys);
-        }
-        fAttributeDAO.delete((MapAttribute)map, query);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#removeEntries(java.lang.String, org.alfresco.service.cmr.attributes.AttrQuery)
-     */
-    public void removeEntries(String path, AttrQuery query)
-    {
-        if (path == null || query == null)
-        {
-            throw new AVMBadArgumentException("Illegal null argument.");
-        }
-        List<String> keys = parsePath(path);
-        removeEntries(keys, query);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#setAttribute(java.util.List, int, org.alfresco.repo.attributes.Attribute)
-     */
-    public void setAttribute(List<String> keys, int index, Attribute value)
-    {
-        if (keys == null || value == null)
-        {
-            throw new AVMBadArgumentException("Illegal Null Argument.");
-        }
-        if (keys.size() < 1)
-        {
-            throw new AVMBadArgumentException("Keys too short.");
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.LIST)
-        {
-            throw new AVMWrongTypeException("Attribute Not List: " + keys);
-        }
-        Attribute converted = fAttributeConverter.toPersistent(value);
-        found.set(index, converted);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#setAttribute(java.lang.String, int, org.alfresco.repo.attributes.Attribute)
-     */
-    public void setAttribute(String path, int index, Attribute value)
-    {
-        if (path == null || value == null)
-        {
-            throw new AVMBadArgumentException("Illegal null argument.");
-        }
-        List<String> keys = parsePath(path);
-        setAttribute(keys, index, value);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#exists(java.util.List)
-     */
-    public boolean exists(List<String> keys)
-    {
-        if (keys == null)
-        {
-            throw new AVMBadArgumentException("Null keys list.");
-        }
-        if (keys.size() == 0)
-        {
-            throw new AVMBadArgumentException("Illegal zero length keys list.");
-        }
-        Attribute attr = getAttributeFromPath(keys);
-        if (attr != null)
-        {
-            fAttributeDAO.evictFlat(attr);
-            return true;
-        }
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#exists(java.lang.String)
-     */
-    public boolean exists(String path)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Null attribute path.");
-        }
-        List<String> keys = parsePath(path);
-        return exists(keys);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#getCount(java.util.List)
-     */
-    public int getCount(List<String> keys)
-    {
-        if (keys == null)
-        {
-            throw new AVMBadArgumentException("Null keys list.");
-        }
-        if (keys.size() == 0)
-        {
-            throw new AVMBadArgumentException("Illegal empty keys list.");
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute not found: " + keys);
-        }
-        if (found.getType() != Attribute.Type.LIST &&
-            found.getType() != Attribute.Type.MAP)
-        {
-            throw new AVMWrongTypeException("Not a map or list: " + keys);
-        }
-        return found.size();
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#getCount(java.lang.String)
-     */
-    public int getCount(String path)
-    {
-        if (path == null)
-        {
-            throw new AVMBadArgumentException("Null attribute path.");
-        }
-        List<String> keys = parsePath(path);
-        return getCount(keys);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#addAttributes(java.util.List, java.util.List)
-     */
-    public void addAttributes(List<String> keys, List<Attribute> values)
-    {
-        if (keys == null || values == null)
-        {
-            throw new AVMBadArgumentException("Illegal null argument.");
-        }
-        if (keys.size() == 0)
-        {
-            throw new AVMBadArgumentException("Zero length keys.");
-        }
-        Attribute list = getAttributeFromPath(keys);
-        if (list.getType() != Attribute.Type.LIST)
-        {
-            throw new AVMWrongTypeException("Attribute not list: " + list.getType());
-        }
-        for (Attribute value : values)
-        {
-            Attribute persistent = fAttributeConverter.toPersistent(value);
-            list.add(persistent);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#addAttributes(java.lang.String, java.util.List)
-     */
-    public void addAttributes(String path, List<Attribute> values)
-    {
-        if (path == null || values == null)
-        {
-            throw new AVMBadArgumentException("Illegal null argument.");
-        }
-        List<String> keys = parsePath(path);
-        addAttributes(keys, values);
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#setAttributes(java.util.List, java.util.Map)
-     */
-    public void setAttributes(List<String> keys, Map<String, Attribute> entries)
-    {
-        if (keys == null || entries == null)
-        {
-            throw new AVMBadArgumentException("Null argument.");
-        }
-        if (keys.size() == 0)
-        {
-            for (Map.Entry<String, Attribute> entry : entries.entrySet())
-            {
-                String name = entry.getKey();
-                Attribute value = entry.getValue();
-                Attribute toSave = fAttributeConverter.toPersistent(value);
-                GlobalAttributeEntry found = fGlobalAttributeEntryDAO.get(name);
-                if (found == null)
-                {
-                    found = new GlobalAttributeEntryImpl(name, toSave);
-                    fGlobalAttributeEntryDAO.save(found);
-                    return;
-                }
-                found.setAttribute(toSave);
-            }
-            return;
-        }
-        Attribute found = getAttributeFromPath(keys);
-        if (found == null)
-        {
-            throw new AVMNotFoundException("Attribute Not Found: " + keys);
-        }
-        if (found.getType() != Type.MAP)
-        {
-            throw new AVMWrongTypeException("Not a Map: " + keys);
-        }
-        for (Map.Entry<String, Attribute> entry : entries.entrySet())
-        {
-            String name = entry.getKey();
-            Attribute value = entry.getValue();
-            found.put(name, fAttributeConverter.toPersistent(value));
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.alfresco.service.cmr.attributes.AttributeService#setAttributes(java.lang.String, java.util.Map)
-     */
-    public void setAttributes(String path, Map<String, Attribute> entries)
-    {
-        if (path == null || entries == null)
-        {
-            throw new AVMBadArgumentException("Illegal null argument.");
-        }
-        List<String> keys = parsePath(path);
-        setAttributes(keys, entries);
-    }
-}
-
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.attributes;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+import org.alfresco.repo.domain.propval.PropertyUniqueConstraintViolation;
+import org.alfresco.repo.domain.propval.PropertyValueDAO;
+import org.alfresco.repo.domain.propval.PropertyValueDAO.PropertyUniqueContextCallback;
+import org.alfresco.service.cmr.attributes.AttributeService;
+import org.alfresco.service.cmr.attributes.DuplicateAttributeException;
+import org.alfresco.util.Pair;
+import org.alfresco.util.ParameterCheck;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Layers on the storage of property values to provide generic attribute storage
+ * 
+ * @see PropertyValueDAO
+ * @author Derek Hulley
+ */
+public class AttributeServiceImpl implements AttributeService
+{
+    private static final Log logger = LogFactory.getLog(AttributeServiceImpl.class);
+    
+    private PropertyValueDAO propertyValueDAO;
+
+    public AttributeServiceImpl()
+    {
+    }
+
+    /**
+     * Set the DAO that handles the unique property persistence
+     */
+    public void setPropertyValueDAO(PropertyValueDAO propertyValueDAO)
+    {
+        this.propertyValueDAO = propertyValueDAO;
+    }
+    
+    /**
+     * Formalize the shape of the variable-size array.
+     * 
+     * @param keys              the variable-size array of 1 to 3 keys
+     * @return                  an array of exactly 3 keys (incl. <tt>null</tt> values)
+     */
+    private Serializable[] normalizeKeys(Serializable ... keys)
+    {
+        if (keys.length < 1 || keys.length > 3)
+        {
+            ParameterCheck.mandatory("keys", null);
+        }
+        return new Serializable[]
+        {
+                keys[0],
+                keys.length > 1 ? keys[1] : null,
+                keys.length > 2 ? keys[2] : null
+        };
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean exists(Serializable ... keys)
+    {
+        keys = normalizeKeys(keys);
+        Pair<Long, Long> pair = propertyValueDAO.getPropertyUniqueContext(keys[0], keys[1], keys[2]);
+        boolean exists = (pair != null);
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(
+                    "Check attribute exists: \n" +
+                    "   Keys:   " + Arrays.asList(keys) + "\n" +
+                    "   exists: " + exists);
+        }
+        return exists;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Serializable getAttribute(Serializable ... keys)
+    {
+        keys = normalizeKeys(keys);
+        Pair<Long, Long> pair = propertyValueDAO.getPropertyUniqueContext(keys[0], keys[1], keys[2]);
+        Serializable value = null;
+        if (pair != null && pair.getSecond() != null)
+        {
+            Long valueId = pair.getSecond();
+            value = propertyValueDAO.getPropertyById(valueId);
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(
+                    "Got attribute: \n" +
+                    "   Keys:   " + Arrays.asList(keys) + "\n" +
+                    "   Value: " + value);
+        }
+        return value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void getAttributes(final AttributeQueryCallback callback, Serializable ... keys)
+    {
+        PropertyUniqueContextCallback propertyUniqueContextCallback = new PropertyUniqueContextCallback()
+        {
+            public void handle(Long id, Long valueId, Serializable[] resultKeyIds)
+            {
+                Serializable value = null;
+                if (valueId != null)
+                {
+                    value = propertyValueDAO.getPropertyById(valueId);
+                }
+                
+                Serializable[] resultsKeyValues = new Serializable[resultKeyIds.length];
+                for (int i = 0; i < resultKeyIds.length; i++)
+                {
+                    if (resultKeyIds[i] != null)
+                    {
+                        Pair<Long, Serializable> keyValuePair = propertyValueDAO.getPropertyValueById((Long)resultKeyIds[i]);
+                        resultsKeyValues[i] = (keyValuePair != null ? keyValuePair.getSecond() : null);
+                    }
+                }
+                
+                callback.handleAttribute(id, value, resultsKeyValues);
+                
+                // Done
+                if (logger.isTraceEnabled())
+                {
+                    logger.trace(
+                            "Got attribute: \n" +
+                            "   Keys:   " + Arrays.asList(resultsKeyValues) + "\n" +
+                            "   Value: " + value);
+                }
+            }
+        };
+        propertyValueDAO.getPropertyUniqueContext(propertyUniqueContextCallback, keys);
+        // Done
+    }
+    
+    /**
+     * {@inheritDoc}
+     */
+    public void setAttribute(Serializable value, Serializable ... keys)
+    {
+        keys = normalizeKeys(keys);
+        Pair<Long, Long> pair = propertyValueDAO.getPropertyUniqueContext(keys[0], keys[1], keys[2]);
+        if (pair == null)
+        {
+            // We can create it.  Any concurrency issue will be handled by the transaction.
+            propertyValueDAO.createPropertyUniqueContext(keys[0], keys[1], keys[2], value);
+        }
+        else
+        {
+            Long id = pair.getFirst();
+            propertyValueDAO.updatePropertyUniqueContext(id, value);
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(
+                    "Set attribute Value: \n" +
+                    "   Keys:   " + Arrays.asList(keys) + "\n" +
+                    "   Value: " + value);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void createAttribute(Serializable value, Serializable... keys)
+    {
+        keys = normalizeKeys(keys);
+        try
+        {
+            propertyValueDAO.createPropertyUniqueContext(keys[0], keys[1], keys[2], value);
+        }
+        catch (PropertyUniqueConstraintViolation e)
+        {
+            throw new DuplicateAttributeException(keys[0], keys[1], keys[2], e); 
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(
+                    "Created attribute: \n" +
+                    "   Keys:   " + Arrays.asList(keys) + "\n" +
+                    "   Value: " + value);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void updateOrCreateAttribute(
+            Serializable keyBefore1,
+            Serializable keyBefore2,
+            Serializable keyBefore3,
+            Serializable keyAfter1,
+            Serializable keyAfter2,
+            Serializable keyAfter3)
+    {
+        Pair<Long, Long> pair = propertyValueDAO.getPropertyUniqueContext(keyBefore1, keyBefore2, keyBefore3);
+        try
+        {
+            if (pair == null)
+            {
+                pair = propertyValueDAO.createPropertyUniqueContext(keyAfter1, keyAfter2, keyAfter3, null);
+            }
+            else
+            {
+                Long id = pair.getFirst();
+                propertyValueDAO.updatePropertyUniqueContext(id, keyAfter1, keyAfter2, keyAfter3);
+            }
+        }
+        catch (PropertyUniqueConstraintViolation e)
+        {
+            throw new DuplicateAttributeException(keyAfter1, keyAfter2, keyAfter3, e); 
+        }
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            Serializable[] keysBefore = normalizeKeys(keyBefore1, keyBefore2, keyBefore3);
+            Serializable[] keysAfter = normalizeKeys(keyAfter1, keyAfter2, keyAfter3);
+            logger.debug(
+                    "Updated attribute: \n" +
+                    "   Before:   " + Arrays.asList(keysBefore) + "\n" +
+                    "   After:    " + Arrays.asList(keysAfter));
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void removeAttribute(Serializable ... keys)
+    {
+        keys = normalizeKeys(keys);
+        int deleted = propertyValueDAO.deletePropertyUniqueContext(keys[0], keys[1], keys[2]);
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(
+                    "Deleted attribute: \n" +
+                    "   Keys:  " + Arrays.asList(keys) + "\n" +
+                    "   Count: " + deleted);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void removeAttributes(Serializable ... keys)
+    {
+        int deleted = propertyValueDAO.deletePropertyUniqueContext(keys);
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug(
+                    "Deleted attributes: \n" +
+                    "   Keys:  " + Arrays.asList(keys) + "\n" +
+                    "   Count: " + deleted);
+        }
+    }
+}