Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vospace-rest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VOSpace INAF
vospace-rest
Commits
759108c4
Commit
759108c4
authored
4 years ago
by
Sara Bertocco
Browse files
Options
Downloads
Patches
Plain Diff
Finalized createNode in NodeDAO, fixed isPublic boolean and partially type not null
parent
41af4c2f
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java
+151
-9
151 additions, 9 deletions
src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java
src/test/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java
+11
-0
11 additions, 0 deletions
...st/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java
with
162 additions
and
9 deletions
src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java
+
151
−
9
View file @
759108c4
...
...
@@ -5,6 +5,7 @@ import net.ivoa.xml.vospace.v2.Node;
import
java.sql.PreparedStatement
;
import
java.sql.ResultSet
;
import
java.sql.SQLException
;
import
java.sql.Types
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Optional
;
...
...
@@ -34,19 +35,66 @@ public class NodeDAO {
jdbcTemplate
=
new
JdbcTemplate
(
dataSource
);
}
public
Node
createNode
(
Node
myNode
)
{
public
void
createNode
(
Node
myNode
)
{
// check if parent path exist, else throw HTTP 404 , secondo specifica vospace
/*
Retrieve the path (ltree) and the relative_path (ltree) of the parent node:
select path, relative_path from node n
join node_vos_path p on n.node_id = p.node_id
where p.vos_path = '/path/to/parent’
Then perform the insert using the path and relative_path to fill the parent_path and parent_relative_path columns of the new node.
*/
String
nodeURI
=
myNode
.
getUri
();
String
path
=
nodeURI
.
replaceAll
(
"vos://[^/]+"
,
""
);
String
parentPath
=
getParentPath
(
path
);
String
sql
=
"SELECT path, relative_path from "
+
"node n join node_vos_path p on n.node_id = p.node_id "
+
"where p.vos_path = ?"
;
List
<
NodePaths
>
paths
=
jdbcTemplate
.
query
(
conn
->
{
PreparedStatement
ps
=
conn
.
prepareStatement
(
sql
);
ps
.
setString
(
1
,
parentPath
);
return
ps
;
},
(
row
,
index
)
->
{
return
getPathsFromResultSet
(
row
);
});
if
(
paths
.
isEmpty
())
{
throw
new
IllegalStateException
(
"Unable to find parent node during node creation"
);
}
StringBuilder
sb
=
new
StringBuilder
();
sb
.
append
(
"INSERT INTO "
);
sb
.
append
(
"NodeProperty"
);
sb
.
append
(
" (nodeID,propertyURI,propertyValue) SELECT ?, ?, ?"
);
sb
.
append
(
" WHERE NOT EXISTS (SELECT * FROM NodeProperty"
);
sb
.
append
(
" WHERE nodeID=? and propertyURI=?)"
);
String
sqlQuery
=
sb
.
toString
();
sb
.
append
(
"INSERT INTO node"
);
sb
.
append
(
" (name, busy_state, owner_id, creator_id, group_read, group_write,"
);
sb
.
append
(
" is_public, parent_path, type)"
);
sb
.
append
(
" VALUES (?, ?, ?, ?, ?, ?, ?, ?, ? )"
);
jdbcTemplate
.
update
(
conn
->
{
PreparedStatement
ps
=
conn
.
prepareStatement
(
sb
.
toString
());
ps
.
setString
(
1
,
getNodeName
(
myNode
));
ps
.
setBoolean
(
2
,
getIsBusy
(
myNode
));
ps
.
setString
(
3
,
getProperty
(
myNode
,
getPropertyURI
(
"creator"
)));
ps
.
setString
(
4
,
getProperty
(
myNode
,
getPropertyURI
(
"creator"
)));
ps
.
setArray
(
5
,
fromPropertyToArray
(
getProperty
(
myNode
,
getPropertyURI
(
"groupread"
))));
ps
.
setArray
(
6
,
fromPropertyToArray
(
getProperty
(
myNode
,
getPropertyURI
(
"groupwrite"
))));
ps
.
setBoolean
(
7
,
Boolean
.
valueOf
(
getProperty
(
myNode
,
getPropertyURI
(
"publicread"
))));
//ps.setBoolean(7, true);
ps
.
setObject
(
8
,
paths
.
get
(
0
).
parentPath
,
Types
.
OTHER
);
ps
.
setString
(
9
,
getProperty
(
myNode
,
getPropertyURI
(
"type"
)));
return
ps
;
});
return
myNode
;
}
public
Optional
<
Node
>
listNode
(
String
path
)
{
String
sql
=
"SELECT os.vos_path, n.node_id, type, async_trans, busy_state, owner_id, group_read, group_write, is_public, content_length, created_on, last_modified from node n\n"
...
...
@@ -168,4 +216,98 @@ public class NodeDAO {
private
String
getUri
(
String
path
)
{
return
"vos://"
+
authority
+
path
;
}
private
NodePaths
getPathsFromResultSet
(
ResultSet
rs
)
throws
SQLException
{
NodePaths
paths
=
new
NodePaths
(
rs
.
getString
(
"path"
),
rs
.
getString
(
"relative_path"
));
return
paths
;
}
private
String
getNodeName
(
String
path
)
{
String
[]
parsedPath
=
path
.
split
(
"/"
);
return
parsedPath
[
parsedPath
.
length
-
1
];
}
private
String
getNodeName
(
Node
myNode
)
{
String
uri
=
myNode
.
getUri
();
return
getNodeName
(
uri
);
}
private
boolean
getIsBusy
(
Node
myNode
)
{
if
(
myNode
instanceof
DataNode
)
{
DataNode
dataNode
=
(
DataNode
)
myNode
;
return
dataNode
.
isBusy
();
}
return
false
;
}
private
String
getParentPath
(
String
path
)
{
String
[]
parsedPath
=
path
.
split
(
"/"
);
StringBuilder
sb
=
new
StringBuilder
();
for
(
int
i
=
0
;
i
<
parsedPath
.
length
-
1
;
i
++)
{
sb
.
append
(
"/"
).
append
(
parsedPath
[
i
]);
}
return
sb
.
toString
();
}
private
String
getProperty
(
Node
node
,
String
uri
)
{
for
(
Property
property
:
node
.
getProperties
())
{
if
(
uri
.
equals
(
property
.
getUri
()))
{
return
property
.
getValue
();
}
}
return
null
;
}
private
Array
fromPropertyToArray
(
String
myProperty
)
{
if
(
myProperty
==
null
||
myProperty
.
isBlank
())
return
null
;
else
{
//myProperty.split(" ")
return
null
;
}
}
private
class
NodePaths
{
private
String
path
;
private
String
parentPath
;
public
NodePaths
(
String
myPath
,
String
myParentPath
)
{
this
.
path
=
myPath
;
this
.
parentPath
=
myParentPath
;
}
public
String
toString
()
{
return
parentPath
+
" "
+
path
;
}
}
}
This diff is collapsed.
Click to expand it.
src/test/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java
+
11
−
0
View file @
759108c4
...
...
@@ -2,6 +2,7 @@ package it.inaf.oats.vospace.persistence;
import
javax.sql.DataSource
;
import
net.ivoa.xml.vospace.v2.ContainerNode
;
import
net.ivoa.xml.vospace.v2.DataNode
;
import
net.ivoa.xml.vospace.v2.Node
;
import
net.ivoa.xml.vospace.v2.Property
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
...
...
@@ -27,6 +28,16 @@ public class NodeDAOTest {
dao
=
new
NodeDAO
(
dataSource
);
}
@Test
public
void
testCreateNode
()
{
DataNode
dataNode
=
new
DataNode
();
dataNode
.
setUri
(
"vos://example.com!vospace/mydata1"
);
dao
.
createNode
(
dataNode
);
}
@Test
public
void
testListNode
()
{
ContainerNode
root
=
(
ContainerNode
)
dao
.
listNode
(
"/"
).
get
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment