From 88a18190d1da58a54623989f9ea56c4308016871 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Tue, 17 Aug 2021 12:11:17 +0200
Subject: [PATCH] Minor fix
---
.../oats/vospace/persistence/NodeDAO.java | 24 +++++++++----------
1 file changed, 11 insertions(+), 13 deletions(-)
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 a3f1444..632d9d6 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;
}
--
GitLab