ItemLockedException used on lock error

git-svn-id: https://svn.d4science-ii.research-infrastructures.eu/gcube/branches/data-access/storagehub-webapp/1.0@178706 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/data/access/storagehub/handlers/UnshareHandler.java

@@ -10,6 +10,7 @@ import javax.inject.Singleton;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.lock.LockException;
 import javax.jcr.security.AccessControlEntry;
 import javax.jcr.security.AccessControlManager;
 
@@ -19,6 +20,7 @@ import org.gcube.common.storagehub.model.Excludes;
 import org.gcube.common.storagehub.model.NodeConstants;
 import org.gcube.common.storagehub.model.exceptions.BackendGenericError;
 import org.gcube.common.storagehub.model.exceptions.InvalidCallParameters;
+import org.gcube.common.storagehub.model.exceptions.ItemLockedException;
 import org.gcube.common.storagehub.model.exceptions.StorageHubException;
 import org.gcube.common.storagehub.model.exceptions.UserNotAuthorizedException;
 import org.gcube.common.storagehub.model.items.FolderItem;
@@ -61,7 +63,12 @@ public class UnshareHandler {
 		if (users==null || users.size()==0 || usersInSharedFolder.size()<=1)
 			return unshareAll(login, ses, sharedItem);
 
-		ses.getWorkspace().getLockManager().lock(sharedNode.getPath(), true, true, 0,login);
+		try {	
+			ses.getWorkspace().getLockManager().lock(sharedNode.getPath(), true, true, 0,login);
+		}catch (LockException e) {
+			throw new ItemLockedException(e);
+		}
+
 		try {
 			if (users.size()==1 && users.contains(login))
 				return unshareCaller(login, ses, sharedItem);
@@ -80,7 +87,12 @@ public class UnshareHandler {
 
 		Node sharedItemNode = ses.getNodeByIdentifier(item.getId());
 
-		ses.getWorkspace().getLockManager().lock(sharedItemNode.getPath(), true, true, 0,login);
+		try {
+			ses.getWorkspace().getLockManager().lock(sharedItemNode.getPath(), true, true, 0,login);
+		}catch (LockException e) {
+			throw new ItemLockedException(e);
+		}
+
 		Node unsharedNode;
 		try {
 			log.debug("user list is empty, I'm going to remove also the shared dir");

src/main/java/org/gcube/data/access/storagehub/services/ItemSharing.java

@@ -7,6 +7,7 @@ import javax.inject.Inject;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.lock.LockException;
 import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.Privilege;
 import javax.servlet.ServletContext;
@@ -29,6 +30,7 @@ import org.gcube.common.storagehub.model.acls.AccessType;
 import org.gcube.common.storagehub.model.exceptions.BackendGenericError;
 import org.gcube.common.storagehub.model.exceptions.InvalidCallParameters;
 import org.gcube.common.storagehub.model.exceptions.InvalidItemException;
+import org.gcube.common.storagehub.model.exceptions.ItemLockedException;
 import org.gcube.common.storagehub.model.exceptions.StorageHubException;
 import org.gcube.common.storagehub.model.items.FolderItem;
 import org.gcube.common.storagehub.model.items.Item;
@@ -108,8 +110,11 @@ public class ItemSharing {
 			}
 			ses.save();
 
-			ses.getWorkspace().getLockManager().lock(sharedFolderNode.getPath(), true, true, 0,login);
+			try {
-
+				ses.getWorkspace().getLockManager().lock(sharedFolderNode.getPath(), true, true, 0,login);
+			}catch (LockException e) {
+				throw new ItemLockedException(e);
+			}
 			try {
 
 				AccessControlManager acm = ses.getAccessControlManager();

src/main/java/org/gcube/data/access/storagehub/services/ItemsCreator.java

@@ -50,6 +50,7 @@ import org.gcube.common.storagehub.model.exceptions.BackendGenericError;
 import org.gcube.common.storagehub.model.exceptions.IdNotFoundException;
 import org.gcube.common.storagehub.model.exceptions.InvalidCallParameters;
 import org.gcube.common.storagehub.model.exceptions.InvalidItemException;
+import org.gcube.common.storagehub.model.exceptions.ItemLockedException;
 import org.gcube.common.storagehub.model.exceptions.StorageHubException;
 import org.gcube.common.storagehub.model.exceptions.UserNotAuthorizedException;
 import org.gcube.common.storagehub.model.items.AbstractFileItem;
@@ -123,7 +124,7 @@ public class ItemsCreator {
 
 			Node destination;
 			try {
-				 destination = ses.getNodeByIdentifier(id);
+				destination = ses.getNodeByIdentifier(id);
 			}catch(ItemNotFoundException inf) {
 				throw new IdNotFoundException(id);
 			}
@@ -133,8 +134,12 @@ public class ItemsCreator {
 
 			authChecker.checkWriteAuthorizationControl(ses, destination.getIdentifier(), true);
 
+			try {
+				ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
+			}catch (LockException le) {
+				throw new ItemLockedException(le);
+			}
 
-			ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
 			Node newNode;
 			try {
 				newNode = Utils.createFolderInternally(ses, destination, name, description, hidden,  login, accountingHandler);
@@ -174,7 +179,7 @@ public class ItemsCreator {
 
 			Node destination;
 			try {
-				 destination = ses.getNodeByIdentifier(id);
+				destination = ses.getNodeByIdentifier(id);
 			}catch(ItemNotFoundException inf) {
 				throw new IdNotFoundException(id);
 			}
@@ -184,7 +189,11 @@ public class ItemsCreator {
 
 			authChecker.checkWriteAuthorizationControl(ses, destination.getIdentifier(), true);
 
-			ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
+			try {
+				ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
+			}catch (LockException le) {
+				throw new ItemLockedException(le);
+			}
 
 			Node newNode;
 			try {
@@ -264,7 +273,7 @@ public class ItemsCreator {
 
 
 
-	private Node createFileItemInternally(Session ses, Node destinationNode,  InputStream stream, String name, String description, String login) throws RepositoryException, UserNotAuthorizedException, BackendGenericError{
+	private Node createFileItemInternally(Session ses, Node destinationNode,  InputStream stream, String name, String description, String login) throws RepositoryException, UserNotAuthorizedException, ItemLockedException, BackendGenericError{
 
 		ContentHandler handler = getContentHandler(stream , name, destinationNode.getPath(), login);
 
@@ -280,7 +289,12 @@ public class ItemsCreator {
 		try {
 			newNode = ses.getNode(org.gcube.common.storagehub.model.Paths.append(org.gcube.common.storagehub.model.Paths.getPath(destinationNode.getPath()), name).toPath());
 			authChecker.checkWriteAuthorizationControl(ses, newNode.getIdentifier(), false);
-			ses.getWorkspace().getLockManager().lock(newNode.getPath(), true, true, 0,login);
+			try {
+				ses.getWorkspace().getLockManager().lock(newNode.getPath(), true, true, 0,login);
+			}catch (LockException le) {
+				throw new ItemLockedException(le);
+			}
+
 			try {
 				versionHandler.checkoutContentNode(newNode, ses);
 				log.trace("replacing content of class {}",item.getContent().getClass());
@@ -291,7 +305,11 @@ public class ItemsCreator {
 			}
 		}catch(PathNotFoundException pnf) {
 			authChecker.checkWriteAuthorizationControl(ses, destinationNode.getIdentifier(), true);
-			ses.getWorkspace().getLockManager().lock(destinationNode.getPath(), false, true, 0,login);
+			try {
+				ses.getWorkspace().getLockManager().lock(destinationNode.getPath(), false, true, 0,login);
+			}catch (LockException le) {
+				throw new ItemLockedException(le);
+			}
 			try {
 				newNode = item2Node.getNode(destinationNode, item);	
 			}finally {
@@ -330,71 +348,72 @@ public class ItemsCreator {
 
 			authChecker.checkWriteAuthorizationControl(ses, destination.getIdentifier() , true);
 
-			ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
-			Node parentDirectoryNode = null;
-
 			try {
-				parentDirectoryNode = Utils.createFolderInternally(ses, destination, parentFolderName, "", false, login, accountingHandler);
+				ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
+			}catch (LockException le) {
+				throw new ItemLockedException(le);
+			}
 
-				Set<Node> fileNodes = new HashSet<>();
+			Node parentDirectoryNode = Utils.createFolderInternally(ses, destination, parentFolderName, "", false, login, accountingHandler);
+			try {
+				if (ses.getWorkspace().getLockManager().isLocked(destination.getPath()))
+					ses.getWorkspace().getLockManager().unlock(destination.getPath());
+			} catch (Throwable t){
+				log.warn("error unlocking {}", destination.getPath(), t);
+			}
+
+			Set<Node> fileNodes = new HashSet<>();
 
 
-				HashMap<String, Node> directoryNodeMap = new HashMap<>();			
+			HashMap<String, Node> directoryNodeMap = new HashMap<>();			
 
-				try (ArchiveInputStream input = new ArchiveStreamFactory()
+			try (ArchiveInputStream input = new ArchiveStreamFactory()
-					    .createArchiveInputStream(new BufferedInputStream(stream, 1024*64))){
+					.createArchiveInputStream(new BufferedInputStream(stream, 1024*64))){
-					ArchiveEntry entry;
+				ArchiveEntry entry;
-					while ((entry = input.getNextEntry()) != null) {
+				while ((entry = input.getNextEntry()) != null) {
-						if (entry.isDirectory()) {
+					if (entry.isDirectory()) {
+						String entirePath = entry.getName();
+						String name = entirePath.replaceAll("(.*/)*(.*)/", "$2");
+						String parentPath = entirePath.replaceAll("(.*/)*(.*)/", "$1");
+						log.debug("creating directory with entire path {}, name {}, parentPath {} ", entirePath, name, parentPath);
+						Node createdNode;
+						if (parentPath.isEmpty()) {
+							createdNode = Utils.createFolderInternally(ses,  parentDirectoryNode, name, "", false, login, accountingHandler);
+						}else { 
+							Node parentNode = directoryNodeMap.get(parentPath);
+							createdNode = Utils.createFolderInternally(ses, parentNode, name, "", false, login, accountingHandler);	
+						}
+						directoryNodeMap.put(entirePath, createdNode);
+						continue;
+					} else {
+						try {
 							String entirePath = entry.getName();
-							String name = entirePath.replaceAll("(.*/)*(.*)/", "$2");
+							String name = entirePath.replaceAll("(.*/)*(.*)", "$2");
-							String parentPath = entirePath.replaceAll("(.*/)*(.*)/", "$1");
+							String parentPath = entirePath.replaceAll("(.*/)*(.*)", "$1");
-							log.debug("creating directory with entire path {}, name {}, parentPath {} ", entirePath, name, parentPath);
+							log.debug("creating file with entire path {}, name {}, parentPath {} ", entirePath, name, parentPath);
-							Node createdNode;
+							Node fileNode = null;
-							if (parentPath.isEmpty()) {
+							if (parentPath.isEmpty())
-								createdNode = Utils.createFolderInternally(ses,  parentDirectoryNode, name, "", false, login, accountingHandler);
+								fileNode = createFileItemInternally(ses, parentDirectoryNode, input, name, "", login);
-							}else { 
+							else { 
 								Node parentNode = directoryNodeMap.get(parentPath);
-								createdNode = Utils.createFolderInternally(ses, parentNode, name, "", false, login, accountingHandler);	
+								fileNode = createFileItemInternally(ses, parentNode, input, name, "", login);
-							}
-							directoryNodeMap.put(entirePath, createdNode);
-							continue;
-						} else {
-							try {
-								String entirePath = entry.getName();
-								String name = entirePath.replaceAll("(.*/)*(.*)", "$2");
-								String parentPath = entirePath.replaceAll("(.*/)*(.*)", "$1");
-								log.debug("creating file with entire path {}, name {}, parentPath {} ", entirePath, name, parentPath);
-								Node fileNode = null;
-								if (parentPath.isEmpty())
-									fileNode = createFileItemInternally(ses, parentDirectoryNode, input, name, "", login);
-								else { 
-									Node parentNode = directoryNodeMap.get(parentPath);
-									fileNode = createFileItemInternally(ses, parentNode, input, name, "", login);
-								}
-								fileNodes.add(fileNode);
-							}catch(Exception e) {
-								log.warn("error getting file {}",entry.getName(),e);
 							}
+							fileNodes.add(fileNode);
+						}catch(Exception e) {
+							log.warn("error getting file {}",entry.getName(),e);
 						}
 					}
-
 				}
 
-				ses.save();
-				for (Node node : fileNodes)
-					versionHandler.checkinContentNode(node, ses);
-				toReturn = parentDirectoryNode.getIdentifier();
-
-			} finally {
-				try {
-					if (ses.getWorkspace().getLockManager().isLocked(destination.getPath()))
-						ses.getWorkspace().getLockManager().unlock(destination.getPath());
-				} catch (Throwable t){
-					log.warn("error unlocking {}", destination.getPath(), t);
-				}
 			}
 
+			ses.save();
+			for (Node node : fileNodes)
+				versionHandler.checkinContentNode(node, ses);
+			toReturn = parentDirectoryNode.getIdentifier();
+
+
+
 		}catch(RepositoryException | ArchiveException | IOException re){
 			log.error("jcr error extracting archive", re);
 			GXOutboundErrorResponse.throwException(new BackendGenericError("jcr error extracting archive", re));

src/main/java/org/gcube/data/access/storagehub/services/ItemsManager.java

@@ -25,6 +25,7 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.lock.LockException;
 import javax.jcr.version.Version;
 import javax.servlet.ServletContext;
 import javax.ws.rs.Consumes;
@@ -57,6 +58,7 @@ import org.gcube.common.storagehub.model.exceptions.BackendGenericError;
 import org.gcube.common.storagehub.model.exceptions.IdNotFoundException;
 import org.gcube.common.storagehub.model.exceptions.InvalidCallParameters;
 import org.gcube.common.storagehub.model.exceptions.InvalidItemException;
+import org.gcube.common.storagehub.model.exceptions.ItemLockedException;
 import org.gcube.common.storagehub.model.exceptions.StorageHubException;
 import org.gcube.common.storagehub.model.exceptions.UserNotAuthorizedException;
 import org.gcube.common.storagehub.model.items.AbstractFileItem;
@@ -739,8 +741,12 @@ public class ItemsManager {
 			if (item.isShared() && (!destinationItem.isShared() || !getSharedParentNode(nodeToMove).getIdentifier().equals(getSharedParentNode(destination).getIdentifier())))
 				throw new InvalidCallParameters("shared Item cannot be moved in a different shared folder or in a private folder");
 
-			ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
+			try {
-			ses.getWorkspace().getLockManager().lock(nodeToMove.getPath(), true, true, 0,login);
+				ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
+				ses.getWorkspace().getLockManager().lock(nodeToMove.getPath(), true, true, 0,login);
+			}catch (LockException e) {
+				throw new ItemLockedException(e);
+			}
 			try {
 				String uniqueName =(Utils.checkExistanceAndGetUniqueName(ses, destination, nodeToMove.getName()));
 				String newPath = String.format("%s/%s",destination.getPath(), uniqueName);
@@ -797,9 +803,12 @@ public class ItemsManager {
 			if (item instanceof FolderItem)
 				throw new InvalidItemException("folder cannot be copied");
 
-
+			try {
-			ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
+				ses.getWorkspace().getLockManager().lock(destination.getPath(), false, true, 0,login);
-			ses.getWorkspace().getLockManager().lock(nodeToCopy.getPath(), true, true, 0,login);
+				ses.getWorkspace().getLockManager().lock(nodeToCopy.getPath(), true, true, 0,login);
+			}catch (LockException e) {
+				throw new ItemLockedException(e);
+			}
 			try {
 				String uniqueName = Utils.checkExistanceAndGetUniqueName(ses, destination, newFileName);				
 				String newPath= String.format("%s/%s", destination.getPath(), uniqueName);
@@ -871,8 +880,13 @@ public class ItemsManager {
 				throw new InvalidItemException("protected folder cannot be renamed");
 
 
-			ses.getWorkspace().getLockManager().lock(nodeToMove.getPath(), true, true, 0,login);
+			try {
-			ses.getWorkspace().getLockManager().lock(nodeToMove.getParent().getPath(), false, true, 0,login);
+				ses.getWorkspace().getLockManager().lock(nodeToMove.getPath(), true, true, 0,login);
+				ses.getWorkspace().getLockManager().lock(nodeToMove.getParent().getPath(), false, true, 0,login);
+			}catch (LockException e) {
+				throw new ItemLockedException(e);
+			}
+
 			try {
 				String uniqueName = Utils.checkExistanceAndGetUniqueName(ses, nodeToMove.getParent(), newName);
 
@@ -919,8 +933,11 @@ public class ItemsManager {
 
 			final Node nodeToUpdate = ses.getNodeByIdentifier(id);
 
-
+			try {
-			ses.getWorkspace().getLockManager().lock(nodeToUpdate.getPath(), false, true, 0,login);
+				ses.getWorkspace().getLockManager().lock(nodeToUpdate.getPath(), false, true, 0,login);
+			}catch (LockException e) {
+				throw new ItemLockedException(e);
+			}
 			try {
 				item2Node.updateMetadataNode(nodeToUpdate, metadata.getMap(), login);
 				ses.save();