X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=e7b3656cfd8e5e7e195a873924f65b92c95eefcb;hb=a093e5c849e70bbc754fa4462dbb6c2b59979973;hp=fdc69214942fde0a57b9ffd679b789097fc78ca9;hpb=7c4ea2803d8dd912e7751b85be4eeb1861905bde;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
index fdc692149..e7b3656cf 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -67,6 +67,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
+import org.argeo.util.security.DigestUtils;
 import org.argeo.util.security.SimplePrincipal;
 
 /** Utility methods to simplify common JCR operations. */
@@ -293,6 +294,54 @@ public class JcrUtils implements ArgeoJcrConstants {
 				.addNode(childName);
 	}
 
+	/** Convert a {@link NodeIterator} to a list of {@link Node} */
+	public static List<Node> nodeIteratorToList(NodeIterator nodeIterator) {
+		List<Node> nodes = new ArrayList<Node>();
+		while (nodeIterator.hasNext()) {
+			nodes.add(nodeIterator.nextNode());
+		}
+		return nodes;
+	}
+
+	/*
+	 * PROPERTIES
+	 */
+
+	/**
+	 * Concisely get the string value of a property or null if this node doesn't
+	 * have this property
+	 */
+	public static String get(Node node, String propertyName) {
+		try {
+			if (!node.hasProperty(propertyName))
+				return null;
+			return node.getProperty(propertyName).getString();
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot get property " + propertyName
+					+ " of " + node, e);
+		}
+	}
+
+	/** Concisely get the boolean value of a property */
+	public static Boolean check(Node node, String propertyName) {
+		try {
+			return node.getProperty(propertyName).getBoolean();
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot get property " + propertyName
+					+ " of " + node, e);
+		}
+	}
+
+	/** Concisely get the bytes array value of a property */
+	public static byte[] getBytes(Node node, String propertyName) {
+		try {
+			return getBinaryAsBytes(node.getProperty(propertyName));
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot get property " + propertyName
+					+ " of " + node, e);
+		}
+	}
+
 	/** Creates the nodes making path, if they don't exist. */
 	public static Node mkdirs(Session session, String path) {
 		return mkdirs(session, path, null, null, false);
@@ -340,6 +389,14 @@ public class JcrUtils implements ArgeoJcrConstants {
 		return mkdirsSafe(session, path, null);
 	}
 
+	/**
+	 * Creates the nodes making the path as {@link NodeType#NT_FOLDER}
+	 */
+	public static Node mkfolders(Session session, String path) {
+		return mkdirs(session, path, NodeType.NT_FOLDER, NodeType.NT_FOLDER,
+				false);
+	}
+
 	/**
 	 * Creates the nodes making path, if they don't exist. This is up to the
 	 * caller to save the session. Use with caution since it can create
@@ -354,7 +411,8 @@ public class JcrUtils implements ArgeoJcrConstants {
 			if (session.itemExists(path)) {
 				Node node = session.getNode(path);
 				// check type
-				if (type != null && !node.isNodeType(type))
+				if (type != null && !node.isNodeType(type)
+						&& !node.getPath().equals("/"))
 					throw new ArgeoException("Node " + node
 							+ " exists but is of type "
 							+ node.getPrimaryNodeType().getName()
@@ -952,6 +1010,23 @@ public class JcrUtils implements ArgeoJcrConstants {
 		}
 	}
 
+	/** Computes the checksum of an nt:file */
+	public static String checksumFile(Node fileNode, String algorithm) {
+		Binary data = null;
+		InputStream in = null;
+		try {
+			data = fileNode.getNode(Node.JCR_CONTENT)
+					.getProperty(Property.JCR_DATA).getBinary();
+			in = data.getStream();
+			return DigestUtils.digest(algorithm, in);
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot checksum file " + fileNode, e);
+		} finally {
+			IOUtils.closeQuietly(in);
+			closeQuietly(data);
+		}
+	}
+
 	/**
 	 * Creates depth from a string (typically a username) by adding levels based
 	 * on its first characters: "aBcD",2 => a/aB
@@ -1476,7 +1551,7 @@ public class JcrUtils implements ArgeoJcrConstants {
 
 	/**
 	 * Add privileges on a path to a {@link Principal}. The path must already
-	 * exist.
+	 * exist. Session is saved.
 	 */
 	public static void addPrivileges(Session session, String path,
 			Principal principal, List<Privilege> privs)
@@ -1512,6 +1587,7 @@ public class JcrUtils implements ArgeoJcrConstants {
 			throw new ArgeoException("Don't know how to apply  privileges "
 					+ privs + " to " + principal + " on " + path);
 		}
+		session.save();
 	}
 
 }