From 911da09f7428574857f2795814ba6d802339c7a6 Mon Sep 17 00:00:00 2001 From: Sonia Zorba Date: Mon, 12 Apr 2021 13:46:16 +0200 Subject: [PATCH] Set date format to ISO 8601 and added ivo://ivoa.net/vospace/core#date property --- src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java | 6 ++++-- .../java/it/inaf/oats/vospace/persistence/NodeDAOTest.java | 6 +++++- 2 files changed, 9 insertions(+), 3 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 a93728b..10ada3f 100644 --- a/src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java +++ b/src/main/java/it/inaf/oats/vospace/persistence/NodeDAO.java @@ -190,8 +190,10 @@ public class NodeDAO { addProperty(NodeProperties.LENGTH_URI, rs.getString("content_length"), properties); - addProperty(NodeProperties.INITIAL_CREATION_TIME_URI, rs.getString("created_on"), - properties); + String creationTime = rs.getString("created_on").replace(" ", "T"); + + addProperty(NodeProperties.INITIAL_CREATION_TIME_URI, creationTime, properties); + addProperty(NodeProperties.DATE_URI, creationTime, properties); // required by CADC addProperty(NodeProperties.CREATOR_URI, rs.getString("creator_id"), properties); diff --git a/src/test/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java b/src/test/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java index e28f10d..c2eb856 100644 --- a/src/test/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java +++ b/src/test/java/it/inaf/oats/vospace/persistence/NodeDAOTest.java @@ -58,10 +58,14 @@ public class NodeDAOTest { public void testListNode() { ContainerNode root = (ContainerNode) dao.listNode("/").get(); assertEquals(2, root.getNodes().size()); - + assertEquals("true", NodeProperties.getNodePropertyAsListByURI(root, NodeProperties.PUBLIC_READ_URI).get(0)); assertEquals("group1 group2", NodeProperties.getNodePropertyByURI(root.getNodes().get(0), NodeProperties.GROUP_READ_URI)); + + String bTime = NodeProperties.getNodePropertyByURI(root.getNodes().get(0), NodeProperties.INITIAL_CREATION_TIME_URI); + assertTrue(bTime.contains("T")); + assertEquals(bTime, NodeProperties.getNodePropertyByURI(root.getNodes().get(0), NodeProperties.DATE_URI)); } @Test -- GitLab