diff --git a/src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java b/src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java index a3f144407735684dfbcf3fc47dcf815d6c25be06..632d9d6fef2c5c228e1061791f701458a7e7392d 100644 --- a/src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java +++ b/src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java @@ -228,11 +228,9 @@ public class NodeDAO { addProperty(NodeProperties.PUBLIC_READ_URI, String.valueOf(rs.getBoolean("is_public")), properties); - addProperty(NodeProperties.QUOTA_URI, String.valueOf(rs.getString("quota")), - properties); + addProperty(NodeProperties.QUOTA_URI, rs.getString("quota"), properties); - addProperty(NodeProperties.MD5_URI, String.valueOf(rs.getString("content_md5")), - properties); + addProperty(NodeProperties.MD5_URI, rs.getString("content_md5"), properties); addProperty("urn:async_trans", String.valueOf(rs.getBoolean("async_trans")), properties); @@ -329,7 +327,7 @@ public class NodeDAO { } public void copyBranch(String sourceVosPath, String destVosPath) { - + String destVosParentPath = NodeUtils.getParentPath(destVosPath); String destName = NodeUtils.getNodeName(destVosPath); @@ -372,15 +370,15 @@ public class NodeDAO { + "copied_nodes_paths AS (" + cteCopiedNodesPaths + ")\n" + parentSelect; - + jdbcTemplate.update(conn -> { PreparedStatement ps = conn.prepareStatement(sql); ps.setString(1, destVosParentPath); ps.setString(2, destName); ps.setString(3, sourceVosPath); return ps; - }); - + }); + } public boolean isBranchBusy(long parentNodeId) { @@ -404,15 +402,15 @@ public class NodeDAO { return ps; }); } - + public void releaseBusyNodesByJobId(String jobId) { String sql = "UPDATE node SET job_id = NULL WHERE job_id = ?"; - + jdbcTemplate.update(conn -> { PreparedStatement ps = conn.prepareStatement(sql); - ps.setString(1, jobId); + ps.setString(1, jobId); return ps; - }); + }); } public boolean isBranchWritable(long parentNodeId, String userId, List<String> userGroups) { @@ -755,7 +753,7 @@ public class NodeDAO { public boolean isPermissionDenied() { return permissionDenied; } - + public boolean isSticky() { return sticky; }