have "get DOI" accept normal form with doi: #5093

IQSS · May 22, 2020 · 431ee35 · 431ee35
1 parent e72616f
commit 431ee35
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Pids.java b/src/main/java/edu/harvard/iq/dataverse/api/Pids.java
@@ -39,7 +39,7 @@ public Response getPid(@QueryParam("persistentId") String persistentId) {
             if (!user.isSuperuser()) {
                 return error(Response.Status.FORBIDDEN, BundleUtil.getStringFromBundle("admin.api.auth.mustBeSuperUser"));
             }
-            String baseUrl = System.getProperty("doi.baseurlstringnext") + "/dois/";
+            String baseUrl = System.getProperty("doi.baseurlstringnext");
             String username = System.getProperty("doi.username");
             String password = System.getProperty("doi.password");
             JsonObjectBuilder result = PidUtil.queryDoi(persistentId, baseUrl, username, password);

diff --git a/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidUtil.java b/src/main/java/edu/harvard/iq/dataverse/pidproviders/PidUtil.java
@@ -1,5 +1,6 @@
 package edu.harvard.iq.dataverse.pidproviders;
 
+import edu.harvard.iq.dataverse.GlobalId;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -13,9 +14,10 @@
 public class PidUtil {
 
     public static JsonObjectBuilder queryDoi(String persistentId, String baseUrl, String username, String password) {
+        String doi = acceptOnlyDoi(persistentId);
         URL url;
         try {
-            url = new URL(baseUrl + persistentId);
+            url = new URL(baseUrl + "/dois/" + doi);
         } catch (MalformedURLException ex) {
             return Json.createObjectBuilder().add("response", ex.getLocalizedMessage());
         }
@@ -60,4 +62,16 @@ public static JsonObjectBuilder queryDoi(String persistentId, String baseUrl, St
         return ret;
     }
 
+    /**
+     * @param PID in the form doi:10.7910/DVN/TJCLKP
+     * @return DOI in the form 10.7910/DVN/TJCLKP (no "doi:")
+     */
+    private static String acceptOnlyDoi(String persistentId) {
+        GlobalId globalId = new GlobalId(persistentId);
+        if (!GlobalId.DOI_PROTOCOL.equals(globalId.getProtocol())) {
+            throw new IllegalArgumentException("Only doi: is supported.");
+        }
+        return globalId.getAuthority() + "/" + globalId.getIdentifier();
+    }
+
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/api/PidsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/PidsIT.java
@@ -22,8 +22,8 @@ public static void setUpClass() {
     @Test
     public void testGetPid() {
         String pid = "";
-        pid = "10.70122/FK2/9BXT5O"; // findable
-        pid = "10.70122/FK2/DNEUDP"; // draft
+        pid = "doi:10.70122/FK2/9BXT5O"; // findable
+        pid = "doi:10.70122/FK2/DNEUDP"; // draft
 
         Response createUser = UtilIT.createRandomUser();
         createUser.prettyPrint();

diff --git a/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java b/src/test/java/edu/harvard/iq/dataverse/pidproviders/PidUtilTest.java
@@ -16,11 +16,12 @@ public class PidUtilTest {
     public void testGetDoi() throws IOException {
         String username = System.getenv("DataCiteUsername");
         String password = System.getenv("DataCitePassword");
-        String baseUrl = "https://api.test.datacite.org/dois/";
+        String baseUrl = "https://api.test.datacite.org";
         String persistentId = "";
-        persistentId = "10.70122/FK2/9BXT5O"; // findable
-        persistentId = "10.70122/FK2/DOES-NOT-EXIST"; // does not exist
-        persistentId = "10.70122/87W6-F672"; // draft
+        persistentId = "doi:10.70122/FK2/9BXT5O"; // findable
+        persistentId = "doi:10.70122/FK2/DOES-NOT-EXIST"; // does not exist
+        persistentId = "doi:10.70122/87W6-F672"; // draft
+        persistentId = "doi:10.70122/87W6-F672"; // draft
         JsonObjectBuilder result = PidUtil.queryDoi(persistentId, baseUrl, username, password);
         String out = JsonUtil.prettyPrint(result.build());
         System.out.println("out: " + out);