inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
118887 jvonka: ACE-198 / ACE-202 / ACE-4734: Perf improvements for CMIS (getChildren et al)\n Merge BRANCHES/DEV/HEAD_ACE198_2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@119389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2015-12-02 10:14:31 +00:00
parent be48287050
commit 60408a953b
8 changed files with 162 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/opencmis/mapping/AbstractProperty.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -39,7 +39,7 @@ import org.alfresco.service.namespace.QName;
*/
public abstract class AbstractProperty implements CMISPropertyAccessor
{
private static final String CONTENT_PROPERTY = "::content";
public static final String CONTENT_PROPERTY = "::content";
private ServiceRegistry serviceRegistry;
protected CMISConnector connector;
@@ -146,8 +146,8 @@ public abstract class AbstractProperty implements CMISPropertyAccessor
{
ContentData contentData = null;
Serializable value = getServiceRegistry().getNodeService().getProperty(nodeInfo.getNodeRef(),
ContentModel.PROP_CONTENT);
Serializable value = nodeInfo.getNodeProps().get(ContentModel.PROP_CONTENT);
if (value != null)
{
contentData = DefaultTypeConverter.INSTANCE.convert(ContentData.class, value);

6
source/java/org/alfresco/opencmis/mapping/DescriptionProperty.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -50,9 +50,7 @@ public class DescriptionProperty extends AbstractProperty
{
if (nodeInfo.getNodeRef() != null)
{
return getServiceRegistry().getNodeService().getProperty(
nodeInfo.getNodeRef(),
ContentModel.PROP_DESCRIPTION);
return nodeInfo.getNodeProps().get(ContentModel.PROP_DESCRIPTION);
}
else if (nodeInfo.getAssociationRef() != null)
{

7
source/java/org/alfresco/opencmis/mapping/DirectProperty.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -22,6 +22,7 @@ import java.io.Serializable;
import java.util.List;
import org.alfresco.opencmis.CMISConnector;
import org.alfresco.opencmis.CMISNodeInfoImpl;
import org.alfresco.opencmis.dictionary.CMISNodeInfo;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -61,9 +62,9 @@ public class DirectProperty extends AbstractProperty
if (nodeInfo.getNodeRef() != null)
{
Serializable result = nodeInfo.getNodeProps().get(alfrescoName);
/* MNT-10548 fix */
Serializable result = getServiceRegistry().getNodeService().getProperty(nodeInfo.getNodeRef(), alfrescoName);
if (result instanceof List)
{
@SuppressWarnings("unchecked")

20
source/java/org/alfresco/opencmis/mapping/SecondaryTypesProperty.java
View File

@@ -1,3 +1,21 @@
/*
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco 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 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.opencmis.mapping;
import java.io.Serializable;
@@ -41,7 +59,7 @@ public class SecondaryTypesProperty extends AbstractProperty
return (Serializable) Collections.emptyList();
}
Set<QName> aspects = connector.getNodeService().getAspects(nodeRef);
Set<QName> aspects = nodeInfo.getNodeAspects();
ArrayList<String> results = new ArrayList<String>(aspects.size());
for (QName aspect : aspects)
{

5
source/java/org/alfresco/opencmis/mapping/VersionSeriesCheckedOutByProperty.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2015 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -53,8 +53,7 @@ public class VersionSeriesCheckedOutByProperty extends AbstractProperty
if (nodeInfo.isPWC())
{
return getServiceRegistry().getNodeService().getProperty(nodeInfo.getNodeRef(),
ContentModel.PROP_WORKING_COPY_OWNER);
return nodeInfo.getNodeProps().get(ContentModel.PROP_WORKING_COPY_OWNER);
} else
{
return getServiceRegistry().getNodeService().getProperty(nodeInfo.getCurrentNodeNodeRef(),