From b6d18cb42d800807c6ad8a4e7f97f05320baa40f Mon Sep 17 00:00:00 2001
From: Adrian Damian <Adrian.Damian@nrc.ca>
Date: Mon, 12 Feb 2024 17:42:53 -0800
Subject: [PATCH] Small updates to make current vostools work with new services

---
 .../org/opencadc/vospace/server/transfers/VOSpaceTransfer.java | 3 ++-
 cadc-vos/build.gradle                                          | 2 +-
 cadc-vos/src/main/java/org/opencadc/vospace/io/NodeReader.java | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cadc-vos-server/src/main/java/org/opencadc/vospace/server/transfers/VOSpaceTransfer.java b/cadc-vos-server/src/main/java/org/opencadc/vospace/server/transfers/VOSpaceTransfer.java
index 0a7a4c60..b7a8709b 100644
--- a/cadc-vos-server/src/main/java/org/opencadc/vospace/server/transfers/VOSpaceTransfer.java
+++ b/cadc-vos-server/src/main/java/org/opencadc/vospace/server/transfers/VOSpaceTransfer.java
@@ -137,7 +137,8 @@ protected VOSpaceTransfer(NodePersistence per, JobUpdater jobUpdater, Job job, T
 
     void validateView()
             throws TransferException, Exception {
-        if (transfer.getView() != null && !transfer.getView().getURI().equals(VOS.VIEW_DEFAULT)) {
+        if (transfer.getView() != null && !transfer.getView().getURI().equals(VOS.VIEW_DEFAULT)
+                && !transfer.getView().getURI().equals(new URI("ivo://cadc.nrc.ca/vospace/view#data"))) {
             Views views = nodePersistence.getViews();
             View view = views.getView(transfer.getView().getURI());
             if (view == null) {
diff --git a/cadc-vos/build.gradle b/cadc-vos/build.gradle
index 8d600f1a..b56adbcb 100644
--- a/cadc-vos/build.gradle
+++ b/cadc-vos/build.gradle
@@ -16,7 +16,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '2.0.2'
+version = '2.0.3'
 
 description = 'OpenCADC VOSpace client library'
 def git_url = 'https://github.com/opencadc/vos'
diff --git a/cadc-vos/src/main/java/org/opencadc/vospace/io/NodeReader.java b/cadc-vos/src/main/java/org/opencadc/vospace/io/NodeReader.java
index 0ef73922..b904eb56 100644
--- a/cadc-vos/src/main/java/org/opencadc/vospace/io/NodeReader.java
+++ b/cadc-vos/src/main/java/org/opencadc/vospace/io/NodeReader.java
@@ -68,6 +68,7 @@
 package org.opencadc.vospace.io;
 
 import ca.nrc.cadc.date.DateUtil;
+import ca.nrc.cadc.util.StringUtil;
 import ca.nrc.cadc.xml.XmlUtil;
 import java.io.IOException;
 import java.io.InputStream;
@@ -481,7 +482,7 @@ protected Set<GroupURI> getGroupURIs(URI key, String delimiter, Set<NodeProperty
         Set<GroupURI> groups = new TreeSet<>();
         NodeProperty nodeProperty = getNodeProperty(key, properties);
         if (nodeProperty != null) {
-            if (nodeProperty.getValue() != null) {
+            if (StringUtil.hasText(nodeProperty.getValue())) {
                 String[] values = nodeProperty.getValue().split(delimiter);
                 for (String value : values) {
                     GroupURI groupURI;