X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=94b1dfdfae31488762ab6ede2cfcb3580eeb3458;hb=905c6bcd909d84c6e980994d9eeed22a0bf237af;hp=5bbc207ea3e918eec41aa5536b5c009b1ca89142;hpb=d2e617c3adda3874dd0fbc26ebe83f64814293c1;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java b/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java
index 5bbc207ea..94b1dfdfa 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/JcrUtils.java
@@ -38,6 +38,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import javax.jcr.Binary;
+import javax.jcr.Credentials;
 import javax.jcr.NamespaceRegistry;
 import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
@@ -991,16 +992,26 @@ public class JcrUtils {
 
 	/** 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 (InputStream in = new ByteArrayInputStream(bytes)) {
-			// in = new ByteArrayInputStream(bytes);
 			binary = node.getSession().getValueFactory().createBinary(in);
 			node.setProperty(property, binary);
 		} catch (Exception e) {
-			throw new ArgeoJcrException("Cannot read binary " + property + " as bytes", e);
+			throw new ArgeoJcrException("Cannot set binary " + property + " as bytes", e);
+		} finally {
+			closeQuietly(binary);
+		}
+	}
+
+	/** Writes a {@link Binary} from a byte array */
+	public static void setBinaryAsBytes(Property prop, byte[] bytes) {
+		Binary binary = null;
+		try (InputStream in = new ByteArrayInputStream(bytes)) {
+			binary = prop.getSession().getValueFactory().createBinary(in);
+			prop.setValue(binary);
+		} catch (RepositoryException | IOException e) {
+			throw new ArgeoJcrException("Cannot set binary " + prop + " as bytes", e);
 		} finally {
-			// IOUtils.closeQuietly(in);
 			closeQuietly(binary);
 		}
 	}
@@ -1057,16 +1068,25 @@ public class JcrUtils {
 	 */
 	public static Session loginOrCreateWorkspace(Repository repository, String workspaceName)
 			throws RepositoryException {
+		return loginOrCreateWorkspace(repository, workspaceName, null);
+	}
+
+	/**
+	 * Login to a workspace with implicit credentials, creates the workspace with
+	 * these credentials if it does not already exist.
+	 */
+	public static Session loginOrCreateWorkspace(Repository repository, String workspaceName, Credentials credentials)
+			throws RepositoryException {
 		Session workspaceSession = null;
 		Session defaultSession = null;
 		try {
 			try {
-				workspaceSession = repository.login(workspaceName);
+				workspaceSession = repository.login(credentials, workspaceName);
 			} catch (NoSuchWorkspaceException e) {
 				// try to create workspace
-				defaultSession = repository.login();
+				defaultSession = repository.login(credentials);
 				defaultSession.getWorkspace().createWorkspace(workspaceName);
-				workspaceSession = repository.login(workspaceName);
+				workspaceSession = repository.login(credentials, workspaceName);
 			}
 			return workspaceSession;
 		} finally {
@@ -1074,15 +1094,19 @@ public class JcrUtils {
 		}
 	}
 
-	/** Logs out the session, not throwing any exception, even if it is null. */
+	/**
+	 * Logs out the session, not throwing any exception, even if it is null.
+	 * {@link Jcr#logout(Session)} should rather be used.
+	 */
 	public static void logoutQuietly(Session session) {
-		try {
-			if (session != null)
-				if (session.isLive())
-					session.logout();
-		} catch (Exception e) {
-			// silent
-		}
+		Jcr.logout(session);
+//		try {
+//			if (session != null)
+//				if (session.isLive())
+//					session.logout();
+//		} catch (Exception e) {
+//			// silent
+//		}
 	}
 
 	/**
@@ -1294,23 +1318,30 @@ public class JcrUtils {
 		return true;
 	}
 
-	/** Gets access control list for this path, throws exception if not found */
+	/**
+	 * Gets the first available access control list for this path, throws exception
+	 * if not found
+	 */
 	public synchronized static AccessControlList getAccessControlList(AccessControlManager acm, String path)
 			throws RepositoryException {
 		// search for an access control list
 		AccessControlList acl = null;
 		AccessControlPolicyIterator policyIterator = acm.getApplicablePolicies(path);
-		if (policyIterator.hasNext()) {
+		applicablePolicies: if (policyIterator.hasNext()) {
 			while (policyIterator.hasNext()) {
 				AccessControlPolicy acp = policyIterator.nextAccessControlPolicy();
-				if (acp instanceof AccessControlList)
+				if (acp instanceof AccessControlList) {
 					acl = ((AccessControlList) acp);
+					break applicablePolicies;
+				}
 			}
 		} else {
 			AccessControlPolicy[] existingPolicies = acm.getPolicies(path);
-			for (AccessControlPolicy acp : existingPolicies) {
-				if (acp instanceof AccessControlList)
+			existingPolicies: for (AccessControlPolicy acp : existingPolicies) {
+				if (acp instanceof AccessControlList) {
 					acl = ((AccessControlList) acp);
+					break existingPolicies;
+				}
 			}
 		}
 		if (acl != null)
@@ -1483,7 +1514,7 @@ public class JcrUtils {
 				contentNode = fileNode.getNode(Node.JCR_CONTENT);
 			} else {
 				fileNode = folderNode.addNode(fileName, NodeType.NT_FILE);
-				contentNode = fileNode.addNode(Node.JCR_CONTENT, NodeType.NT_RESOURCE);
+				contentNode = fileNode.addNode(Node.JCR_CONTENT, NodeType.NT_UNSTRUCTURED);
 			}
 			binary = contentNode.getSession().getValueFactory().createBinary(in);
 			contentNode.setProperty(Property.JCR_DATA, binary);
@@ -1495,6 +1526,11 @@ public class JcrUtils {
 		}
 	}
 
+	/** Read an an nt:file as an {@link InputStream}. */
+	public static InputStream getFileAsStream(Node fileNode) throws RepositoryException {
+		return fileNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary().getStream();
+	}
+
 	/**
 	 * Computes the checksum of an nt:file.
 	 * 
@@ -1502,14 +1538,11 @@ public class JcrUtils {
 	 */
 	@Deprecated
 	public static String checksumFile(Node fileNode, String algorithm) {
-		Binary data = null;
 		try (InputStream in = fileNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary()
 				.getStream()) {
 			return digest(algorithm, in);
 		} catch (RepositoryException | IOException e) {
 			throw new ArgeoJcrException("Cannot checksum file " + fileNode, e);
-		} finally {
-			closeQuietly(data);
 		}
 	}