Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

122324 jkaabimofrad: FileFolder API minor update: Consistently use the Override annotation - Effective Java.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126466 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-05-10 11:04:19 +00:00
parent 64910d2d77
commit 484f6e355c

View File

@@ -281,11 +281,13 @@ public class NodesImpl implements Nodes
* *
* Note: assumes workspace://SpacesStore * Note: assumes workspace://SpacesStore
*/ */
@Override
public NodeRef validateNode(String nodeId) public NodeRef validateNode(String nodeId)
{ {
return validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId); return validateNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, nodeId);
} }
@Override
public NodeRef validateNode(StoreRef storeRef, String nodeId) public NodeRef validateNode(StoreRef storeRef, String nodeId)
{ {
String versionLabel = null; String versionLabel = null;
@@ -306,6 +308,7 @@ public class NodesImpl implements Nodes
return validateNode(nodeRef); return validateNode(nodeRef);
} }
@Override
public NodeRef validateNode(NodeRef nodeRef) public NodeRef validateNode(NodeRef nodeRef)
{ {
if (!nodeService.exists(nodeRef)) if (!nodeService.exists(nodeRef))
@@ -319,6 +322,7 @@ public class NodesImpl implements Nodes
/* /*
* Check that nodes exists and matches given expected/excluded type(s). * Check that nodes exists and matches given expected/excluded type(s).
*/ */
@Override
public boolean nodeMatches(NodeRef nodeRef, Set<QName> expectedTypes, Set<QName> excludedTypes) public boolean nodeMatches(NodeRef nodeRef, Set<QName> expectedTypes, Set<QName> excludedTypes)
{ {
return nodeMatches(nodeRef, expectedTypes, excludedTypes, true); return nodeMatches(nodeRef, expectedTypes, excludedTypes, true);
@@ -379,6 +383,7 @@ public class NodesImpl implements Nodes
/** /**
* @deprecated review usage (backward compat') * @deprecated review usage (backward compat')
*/ */
@Override
public Node getNode(String nodeId) public Node getNode(String nodeId)
{ {
NodeRef nodeRef = validateNode(nodeId); NodeRef nodeRef = validateNode(nodeId);
@@ -459,6 +464,7 @@ public class NodesImpl implements Nodes
/** /**
* @deprecated note: currently required for backwards compat' (Favourites API) * @deprecated note: currently required for backwards compat' (Favourites API)
*/ */
@Override
public Document getDocument(NodeRef nodeRef) public Document getDocument(NodeRef nodeRef)
{ {
Type type = getType(nodeRef); Type type = getType(nodeRef);
@@ -497,6 +503,7 @@ public class NodesImpl implements Nodes
/** /**
* @deprecated note: currently required for backwards compat' (Favourites API) * @deprecated note: currently required for backwards compat' (Favourites API)
*/ */
@Override
public Folder getFolder(NodeRef nodeRef) public Folder getFolder(NodeRef nodeRef)
{ {
Type type = getType(nodeRef); Type type = getType(nodeRef);
@@ -634,6 +641,7 @@ public class NodesImpl implements Nodes
return fileInfo.getNodeRef(); return fileInfo.getNodeRef();
} }
@Override
public Node getFolderOrDocument(String nodeId, Parameters parameters) public Node getFolderOrDocument(String nodeId, Parameters parameters)
{ {
String path = parameters.getParameter(PARAM_RELATIVE_PATH); String path = parameters.getParameter(PARAM_RELATIVE_PATH);
@@ -897,6 +905,7 @@ public class NodesImpl implements Nodes
return aspectNames; return aspectNames;
} }
@Override
public CollectionWithPagingInfo<Node> listChildren(String parentFolderNodeId, Parameters parameters) public CollectionWithPagingInfo<Node> listChildren(String parentFolderNodeId, Parameters parameters)
{ {
String path = parameters.getParameter(PARAM_RELATIVE_PATH); String path = parameters.getParameter(PARAM_RELATIVE_PATH);
@@ -1106,6 +1115,7 @@ public class NodesImpl implements Nodes
return ignoreQNameAspects; return ignoreQNameAspects;
} }
@Override
public void deleteNode(String nodeId) public void deleteNode(String nodeId)
{ {
NodeRef nodeRef = validateNode(nodeId); NodeRef nodeRef = validateNode(nodeId);
@@ -1113,6 +1123,7 @@ public class NodesImpl implements Nodes
} }
// TODO should we able to specify content properties (eg. mimeType ... or use extension for now, or encoding) // TODO should we able to specify content properties (eg. mimeType ... or use extension for now, or encoding)
@Override
public Node createNode(String parentFolderNodeId, Node nodeInfo, Parameters parameters) public Node createNode(String parentFolderNodeId, Node nodeInfo, Parameters parameters)
{ {
if (nodeInfo.getNodeRef() != null) if (nodeInfo.getNodeRef() != null)
@@ -1250,6 +1261,7 @@ public class NodesImpl implements Nodes
} }
} }
@Override
public Node updateNode(String nodeId, Node nodeInfo, Parameters parameters) public Node updateNode(String nodeId, Node nodeInfo, Parameters parameters)
{ {
final NodeRef nodeRef = validateNode(nodeId); final NodeRef nodeRef = validateNode(nodeId);
@@ -1396,6 +1408,7 @@ public class NodesImpl implements Nodes
return getFolderOrDocument(nodeRef.getId(), parameters); return getFolderOrDocument(nodeRef.getId(), parameters);
} }
@Override
public Node moveOrCopyNode(String sourceNodeId, String targetParentId, String name, Parameters parameters, boolean isCopy) public Node moveOrCopyNode(String sourceNodeId, String targetParentId, String name, Parameters parameters, boolean isCopy)
{ {
if ((sourceNodeId == null) || (sourceNodeId.isEmpty())) if ((sourceNodeId == null) || (sourceNodeId.isEmpty()))