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

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

Browse Source 
118471 jvonka: ACE-4734 - minor: add optional info/debug logging for CMIS calls (to get/list object/objects)
   - relates to ACE-198 & ACE-202


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2015-11-27 10:12:58 +00:00
parent 3294710888
commit ef75f4d89e
2 changed files with 136 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
View File

@@ -554,10 +554,8 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
}
}
if (logger.isDebugEnabled())
{
logger.debug("getChildren: " + list.size() + " in " + (System.currentTimeMillis() - start) + " msecs");
}
logGetObjectsCall("getChildren", start, folderId, list.size(), filter, includeAllowableActions, includeRelationships,
renditionFilter, includePathSegment, extension, skipCount, maxItems, orderBy, null);
return result;
}
@@ -568,6 +566,8 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
String renditionFilter, Boolean includePathSegment, ExtensionsData extension)
{
long start = System.currentTimeMillis();
checkRepositoryId(repositoryId);
List<ObjectInFolderContainer> result = new ArrayList<ObjectInFolderContainer>();
@@ -580,6 +580,9 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
includeAllowableActions, includeRelationships, renditionFilter, includePathSegment, false,
result);
logGetObjectsCall("getDescendants", start, folderId, countDescendantsTree(result), filter, includeAllowableActions, includeRelationships,
renditionFilter, includePathSegment, extension, null, null, null, depth);
return result;
}
@@ -589,6 +592,8 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
String renditionFilter, Boolean includePathSegment, ExtensionsData extension)
{
long start = System.currentTimeMillis();
checkRepositoryId(repositoryId);
List<ObjectInFolderContainer> result = new ArrayList<ObjectInFolderContainer>();
@@ -600,9 +605,89 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
filter, includeAllowableActions, includeRelationships, renditionFilter, includePathSegment, true,
result);
logGetObjectsCall("getFolderTree", start, folderId, countDescendantsTree(result), filter, includeAllowableActions, includeRelationships,
renditionFilter, includePathSegment, extension, null, null, null, depth);
return result;
}
protected void logGetObjectsCall(String methodName, long start, String folderId, int itemCount,
String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
String renditionFilter, Boolean includePathSegment, ExtensionsData extensionsData,
BigInteger skipCount, BigInteger maxItems, String orderBy, BigInteger depth)
{
if (logger.isDebugEnabled())
{
StringBuilder sb = new StringBuilder();
sb.append(methodName).append(": ").append(folderId).append(" - ").append(itemCount)
.append(" in ").append(System.currentTimeMillis()-start).append(" ms")
.append(" [includeAllowableActions=").append(includeAllowableActions)
.append(",includeRelationships=").append(includeRelationships).append(",renditionFilter=").append(renditionFilter);
if (includePathSegment != null) {
sb.append((methodName.equals("getObjectParents") ? ",includeRelativePathSegment=" : ",includePathSegment="))
.append(includePathSegment);
}
if (filter != null) { sb.append(",filter=").append(filter); }
if (skipCount != null) { sb.append(",skipCount=").append(skipCount); }
if (maxItems != null) { sb.append(",maxItems=").append(maxItems); }
if (orderBy != null) { sb.append(",orderBy=").append(orderBy); }
if (depth != null) { sb.append(",depth=").append(depth); }
if (extensionsData != null) { sb.append(",extensionsData=").append(extensionsData); }
sb.append("]");
logger.debug(sb.toString());
}
else if (logger.isInfoEnabled())
{
StringBuilder sb = new StringBuilder();
sb.append(methodName).append(": ").append(folderId).append(" - ").append(itemCount)
.append(" in ").append(System.currentTimeMillis()-start).append(" ms");
logger.info(sb.toString());
}
}
private int countDescendantsTree(List<ObjectInFolderContainer> tree) {
int c = tree.size();
for (ObjectInFolderContainer o : tree) {
c += countDescendantsTree(o.getChildren());
}
return c;
}
protected void logGetObjectCall(String methodName, long start, String idOrPath,
String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
String renditionFilter, Boolean includePolicyIds, Boolean includeAcl,
Boolean isObjectInfoRequired, ExtensionsData extensionsData)
{
if (logger.isDebugEnabled())
{
StringBuilder sb = new StringBuilder();
sb.append(methodName).append(": ").append(idOrPath).append(" in ").append(System.currentTimeMillis()-start).append(" ms")
.append(" [includeAllowableActions=").append(includeAllowableActions)
.append(",includeRelationships=").append(includeRelationships).append(",renditionFilter=").append(renditionFilter)
.append(",includePolicyIds=").append(includePolicyIds).append(",includeAcl=").append(includeAcl)
.append(",isObjectInfoRequired=").append(isObjectInfoRequired);
if (filter != null) { sb.append(",filter=").append(filter); }
if (extensionsData != null) { sb.append(",extensionsData=").append(extensionsData); }
sb.append("]");
logger.debug(sb.toString());
}
else if (logger.isInfoEnabled())
{
StringBuilder sb = new StringBuilder();
sb.append(methodName).append(": ").append(idOrPath).append(" in ").append(System.currentTimeMillis()-start).append(" ms");
logger.info(sb.toString());
}
}
private void getDescendantsTree(
String repositoryId, NodeRef folderNodeRef, int depth, String filter,
Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
@@ -733,6 +818,8 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
Boolean includeRelativePathSegment, ExtensionsData extension)
{
long start = System.currentTimeMillis();
checkRepositoryId(repositoryId);
List<ObjectParentData> result = new ArrayList<ObjectParentData>();
@@ -803,6 +890,9 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
}
}
logGetObjectsCall("getObjectParents", start, objectId, result.size(), filter, includeAllowableActions, includeRelationships,
renditionFilter, includeRelativePathSegment, extension, null, null, null, null);
return result;
}
@@ -812,6 +902,8 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
Boolean includeAllowableActions, IncludeRelationships includeRelationships, String renditionFilter,
BigInteger maxItems, BigInteger skipCount, ExtensionsData extension)
{
long start = System.currentTimeMillis();
checkRepositoryId(repositoryId);
// convert BigIntegers to int
@@ -959,6 +1051,9 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
// has more ?
result.setHasMoreItems(nodeRefs.size() - skip > list.size());
logGetObjectsCall("getCheckedOutDocs", start, folderId, list.size(), filter, includeAllowableActions, includeRelationships,
renditionFilter, null, extension, skipCount, maxItems, orderBy, null);
return result;
}
@@ -1708,6 +1803,8 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
Boolean includeAcl, ExtensionsData extension)
{
long start = System.currentTimeMillis();
checkRepositoryId(repositoryId);
// what kind of object is it?
@@ -1724,6 +1821,9 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
getObjectInfo(repositoryId, info.getObjectId(), includeRelationships);
}
logGetObjectCall("getObject", start, objectId, filter, includeAllowableActions, includeRelationships,
renditionFilter, includePolicyIds, includeAcl, isObjectInfoRequired, extension);
return object;
}
@@ -1920,15 +2020,21 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
IncludeRelationships includeRelationships, String renditionFilter, Boolean includePolicyIds,
Boolean includeAcl, ExtensionsData extension)
{
long start = System.currentTimeMillis();
boolean isObjectInfoRequired = false;
checkRepositoryId(repositoryId);
// start at the root node
NodeRef rootNodeRef = connector.getRootNodeRef();
ObjectData object;
if (path.equals("/"))
{
return connector.createCMISObject(createNodeInfo(rootNodeRef), filter, includeAllowableActions,
includeRelationships, renditionFilter, includePolicyIds, includeAcl);
object = connector.createCMISObject(createNodeInfo(rootNodeRef), filter, includeAllowableActions,
includeRelationships, renditionFilter, includePolicyIds, includeAcl);
}
else
{
@@ -1939,30 +2045,34 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
rootNodeRef,
Arrays.asList(path.substring(1).split("/")));
if(connector.filter(fileInfo.getNodeRef()))
if (connector.filter(fileInfo.getNodeRef()))
{
throw new CmisObjectNotFoundException("Object not found: " + path);
}
CMISNodeInfo info = createNodeInfo(fileInfo.getNodeRef());
ObjectData object = connector.createCMISObject(
object = connector.createCMISObject(
info, fileInfo, filter, includeAllowableActions,
includeRelationships, renditionFilter, includePolicyIds, includeAcl);
boolean isObjectInfoRequired = getContext().isObjectInfoRequired();
isObjectInfoRequired = getContext().isObjectInfoRequired();
if (isObjectInfoRequired)
{
getObjectInfo(repositoryId, info.getObjectId(), includeRelationships);
}
return object;
}
catch (FileNotFoundException e)
{
throw new CmisObjectNotFoundException("Object not found: " + path);
}
}
logGetObjectCall("getObjectByPath", start, path, filter, includeAllowableActions, includeRelationships,
renditionFilter, includePolicyIds, includeAcl, isObjectInfoRequired, extension);
return object;
}
@Override
@@ -2276,6 +2386,8 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
Boolean major, String filter, Boolean includeAllowableActions, IncludeRelationships includeRelationships,
String renditionFilter, Boolean includePolicyIds, Boolean includeAcl, ExtensionsData extension)
{
long start = System.currentTimeMillis();
checkRepositoryId(repositoryId);
if (objectId != null)
@@ -2298,6 +2410,12 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
getObjectInfo(repositoryId, info.getObjectId(), includeRelationships);
}
StringBuilder sb = new StringBuilder();
sb.append(objectId).append("-").append(versionSeriesId);
logGetObjectCall("getObjectOfLatestVersion", start, sb.toString(), filter, includeAllowableActions, includeRelationships,
renditionFilter, includePolicyIds, includeAcl, isObjectInfoRequired, extension);
return object;
}