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=08f8d55c393727aecb32259c6b6f45df97db931c;hb=7b192bb9e877cada25fc90ff339e6129cd007b38;hp=350ed4543f6df8b8a7917ab394f2ca060c532556;hpb=c0b7b3f9d1781d074ab35d24017042fa9415e1e4;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 350ed4543..08f8d55c3 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
@@ -16,6 +16,9 @@
 
 package org.argeo.jcr;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.DateFormat;
@@ -52,6 +55,7 @@ import javax.jcr.query.qom.QueryObjectModelFactory;
 import javax.jcr.query.qom.Selector;
 import javax.jcr.query.qom.StaticOperand;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
@@ -219,14 +223,35 @@ public class JcrUtils implements ArgeoJcrConstants {
 		return path.substring(index + 1);
 	}
 
+	/**
+	 * Routine that get the child with this name, adding id it does not already
+	 * exist
+	 */
+	public static Node getOrAdd(Node parent, String childName,
+			String childPrimaryNodeType) throws RepositoryException {
+		return parent.hasNode(childName) ? parent.getNode(childName) : parent
+				.addNode(childName, childPrimaryNodeType);
+	}
+
+	/**
+	 * Routine that get the child with this name, adding id it does not already
+	 * exist
+	 */
+	public static Node getOrAdd(Node parent, String childName)
+			throws RepositoryException {
+		return parent.hasNode(childName) ? parent.getNode(childName) : parent
+				.addNode(childName);
+	}
+
 	/** 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);
 	}
 
 	/**
-	 * @deprecated use {@link #mkdirs(Session, String, String, String, Boolean)}
-	 *             instead.
+	 * use {@link #mkdirs(Session, String, String, String, Boolean)} instead.
+	 * 
+	 * @deprecated
 	 */
 	@Deprecated
 	public static Node mkdirs(Session session, String path, String type,
@@ -659,6 +684,43 @@ public class JcrUtils implements ArgeoJcrConstants {
 		binary.dispose();
 	}
 
+	/** Retrieve a {@link Binary} as a byte array */
+	public static byte[] getBinaryAsBytes(Property property) {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		InputStream in = null;
+		Binary binary = null;
+		try {
+			binary = property.getBinary();
+			in = binary.getStream();
+			IOUtils.copy(in, out);
+			return out.toByteArray();
+		} catch (Exception e) {
+			throw new ArgeoException("Cannot read binary " + property
+					+ " as bytes", e);
+		} finally {
+			IOUtils.closeQuietly(out);
+			IOUtils.closeQuietly(in);
+			closeQuietly(binary);
+		}
+	}
+
+	/** Writes a {@link Binary} from a byte array */
+	public static void setBinaryAsBytes(Node node, String property, byte[] bytes) {
+		InputStream in = null;
+		Binary binary = null;
+		try {
+			in = new ByteArrayInputStream(bytes);
+			binary = node.getSession().getValueFactory().createBinary(in);
+			node.setProperty(property, binary);
+		} catch (Exception e) {
+			throw new ArgeoException("Cannot read binary " + property
+					+ " as bytes", e);
+		} finally {
+			IOUtils.closeQuietly(in);
+			closeQuietly(binary);
+		}
+	}
+
 	/**
 	 * Creates depth from a string (typically a username) by adding levels based
 	 * on its first characters: "aBcD",2 => a/aB