Refs #2507: Minor adjustments

diasf · diasf · commit d68273a824f8 · 2024-07-19T13:35:39.000+02:00
diff --git a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/harvest/HarvestingClient.java b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/harvest/HarvestingClient.java
@@ -3,6 +3,7 @@
 import edu.harvard.iq.dataverse.persistence.JpaEntity;
 import edu.harvard.iq.dataverse.persistence.dataset.Dataset;
 import edu.harvard.iq.dataverse.persistence.dataverse.Dataverse;
+import io.vavr.control.Option;
 import org.hibernate.validator.constraints.NotBlank;
 
 import javax.persistence.CascadeType;
@@ -132,7 +133,7 @@ public String getHarvestingUrl() {
     }
 
     public void setHarvestingUrl(String harvestingUrl) {
-        this.harvestingUrl = harvestingUrl.trim();
+        this.harvestingUrl = Option.of(harvestingUrl).map(String::trim).getOrNull();
     }
 
     private String archiveUrl;
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java
@@ -632,11 +632,7 @@ protected <T> Response accepted(T objectToBeSerialized) {
     }
 
     protected Response accepted() {
-        return Response.accepted()
-                .entity(Json.createObjectBuilder()
-                        .add("status", STATUS_WF_IN_PROGRESS)
-                        .build())
-                .build();
+        return Response.accepted().build();
     }
 
     protected Response notFound(String msg) {
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/citation/CitationDataExtractor.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/citation/CitationDataExtractor.java
@@ -217,7 +217,8 @@ private boolean shouldCreateGlobalId(DatasetVersion dsv) {
         return !dsv.getDataset().isHarvested()
                 || HarvestStyle.VDC.equals(harvestStyle)
                 || HarvestStyle.ICPSR.equals(harvestStyle)
-                || HarvestStyle.DATAVERSE.equals(harvestStyle);
+                || HarvestStyle.DATAVERSE.equals(harvestStyle)
+                || HarvestStyle.DOI.equals(harvestStyle);
     }
 
     private Date extractCitationDate(DatasetVersion dsv) {
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/DataciteDOIHarvester.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/DataciteDOIHarvester.java
@@ -8,12 +8,14 @@
 import edu.harvard.iq.dataverse.persistence.harvest.HarvestType;
 import edu.harvard.iq.dataverse.persistence.harvest.HarvestingClient;
 
+import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 @Stateless
+@LocalBean
 public class DataciteDOIHarvester implements Harvester<DataciteHarvesterParams> {
 
 
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/DataciteDatasetMapper.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/DataciteDatasetMapper.java
@@ -9,12 +9,14 @@
 import edu.harvard.iq.dataverse.common.DatasetFieldConstant;
 import edu.harvard.iq.dataverse.globalid.DataCiteFindDoiResponse;
 import edu.harvard.iq.dataverse.persistence.GlobalId;
+import edu.harvard.iq.dataverse.persistence.dataset.DatasetVersion;
 import io.vavr.control.Option;
 import org.apache.commons.lang.StringUtils;
 
 import javax.ejb.Stateless;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -44,7 +46,11 @@ public DatasetDTO toDataset(DataCiteFindDoiResponse response) {
 
         MetadataBlockWithFieldsDTO citationBlock = new MetadataBlockWithFieldsDTO();
         citationBlock.setFields(new ArrayList<>());
-        datasetVersion.getMetadataBlocks().put("citation", citationBlock);
+        HashMap<String, MetadataBlockWithFieldsDTO> metadataBlocks = new HashMap<>();
+        datasetVersion.setMetadataBlocks(metadataBlocks);
+        datasetVersion.setVersionState(DatasetVersion.VersionState.RELEASED.name());
+
+        metadataBlocks.put("citation", citationBlock);
 
         addPrimitiveToBlock(citationBlock, DatasetFieldConstant.title, extractFirstTitle(getTitlesWithoutType(attributes)));
         addPrimitiveToBlock(citationBlock, DatasetFieldConstant.alternativeTitle, extractFirstTitle(getTitlesByType(attributes, DataCiteFindDoiResponse.TitleType.AlternativeTitle)));
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/DataciteHarvesterParams.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/DataciteHarvesterParams.java
@@ -1,7 +1,10 @@
 package edu.harvard.iq.dataverse.harvest.client;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.vavr.control.Option;
+
+import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Parameters used by the datacite DOI harvester.
@@ -10,24 +13,18 @@ public class DataciteHarvesterParams extends HarvesterParams {
 
     private final static String DOI_PART_SEPARATOR = "/";
 
-    private final List<DOIValue> doiImport;
-
-    // -------------------- CONSTRUCTORS --------------------
-
-    public DataciteHarvesterParams(List<DOIValue> doi) {
-        this.doiImport = doi;
-    }
+    private List<DOIValue> doiImport;
 
     // -------------------- GETTERS --------------------
 
     public List<DOIValue> getDoiImport() {
-        return doiImport;
+        return Option.of(doiImport).getOrElse(Collections.emptyList());
     }
 
-    // -------------------- LOGIC --------------------
+    // -------------------- SETTERS --------------------
 
-    public static DataciteHarvesterParams fromFullDOIList(List<String> fullDOI) {
-        return new DataciteHarvesterParams(fullDOI.stream().map(DOIValue::parseFullDOI).collect(Collectors.toList()));
+    public void setDoiImport(List<DOIValue> doiImport) {
+        this.doiImport = doiImport;
     }
 
     // -------------------- INNER CLASSES --------------------
@@ -43,6 +40,15 @@ public DOIValue(String authority, String id) {
             this.id = id;
         }
 
+        public DOIValue(String fullDoi) {
+            String[] doiParts = fullDoi.split(DOI_PART_SEPARATOR);
+            if (doiParts.length != 2) {
+                throw new IllegalArgumentException("Invalid DOI: " + fullDoi);
+            }
+            this.authority = doiParts[0];
+            this.id = doiParts[1];
+        }
+
         // -------------------- GETTERS --------------------
 
         public String getAuthority() {
@@ -56,16 +62,5 @@ public String getId() {
         public String getFull() {
             return authority + DOI_PART_SEPARATOR + id;
         }
-
-        // -------------------- LOGIC --------------------
-
-        public static DOIValue parseFullDOI(String fullDOI) {
-            String[] doiParts = fullDOI.split(DOI_PART_SEPARATOR);
-            if (doiParts.length != 2) {
-                throw new IllegalArgumentException("Invalid DOI: " + fullDOI);
-            }
-            return new DOIValue(doiParts[0], doiParts[1]);
-        }
-
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/OAIHarvester.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/harvest/client/OAIHarvester.java
@@ -24,6 +24,7 @@
 import org.dspace.xoai.serviceprovider.exceptions.IdDoesNotExistException;
 
 import javax.ejb.EJB;
+import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
@@ -39,6 +40,7 @@
  * Harvester for OAI clients.
  */
 @Stateless
+@LocalBean
 public class OAIHarvester implements Harvester<HarvesterParams.EmptyHarvesterParams> {
 
     @PersistenceContext(unitName = "VDCNet-ejbPU")
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
@@ -18,6 +18,7 @@
 import edu.harvard.iq.dataverse.persistence.group.IpAddress;
 import edu.harvard.iq.dataverse.persistence.group.IpAddressRange;
 import edu.harvard.iq.dataverse.persistence.group.IpGroup;
+import edu.harvard.iq.dataverse.persistence.harvest.HarvestStyle;
 import edu.harvard.iq.dataverse.persistence.harvest.HarvestType;
 import edu.harvard.iq.dataverse.persistence.harvest.HarvestingClient;
 import edu.harvard.iq.dataverse.persistence.workflow.Workflow;
@@ -701,6 +702,7 @@ public String parseHarvestingClient(JsonObject obj, HarvestingClient harvestingC
 
         harvestingClient.setName(obj.getString("nickName", null));
         harvestingClient.setHarvestType(Option.of(obj.getString("type", null)).map(HarvestType::valueOf).getOrNull());
+        harvestingClient.setHarvestStyle(Option.of(obj.getString("style", null)).map(HarvestStyle::valueOf).getOrNull());
         harvestingClient.setHarvestingUrl(obj.getString("harvestUrl", null));
         harvestingClient.setArchiveUrl(obj.getString("archiveUrl", null));
         harvestingClient.setMetadataPrefix(obj.getString("metadataFormat", null));

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import edu.harvard.iq.dataverse.persistence.JpaEntity;`
`4`	`4`	`import edu.harvard.iq.dataverse.persistence.dataset.Dataset;`
`5`	`5`	`import edu.harvard.iq.dataverse.persistence.dataverse.Dataverse;`
	`6`	`+import io.vavr.control.Option;`
`6`	`7`	`import org.hibernate.validator.constraints.NotBlank;`
`7`	`8`
`8`	`9`	`import javax.persistence.CascadeType;`
`@@ -132,7 +133,7 @@ public String getHarvestingUrl() {`
`132`	`133`	`}`
`133`	`134`
`134`	`135`	`public void setHarvestingUrl(String harvestingUrl) {`
`135`		`- this.harvestingUrl = harvestingUrl.trim();`
	`136`	`+ this.harvestingUrl = Option.of(harvestingUrl).map(String::trim).getOrNull();`
`136`	`137`	`}`
`137`	`138`
`138`	`139`	`private String archiveUrl;`
Original file line number	Diff line number	Diff line change
`@@ -632,11 +632,7 @@ protected <T> Response accepted(T objectToBeSerialized) {`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`protected Response accepted() {`
`635`		`- return Response.accepted()`
`636`		`- .entity(Json.createObjectBuilder()`
`637`		`- .add("status", STATUS_WF_IN_PROGRESS)`
`638`		`- .build())`
`639`		`- .build();`
	`635`	`+ return Response.accepted().build();`
`640`	`636`	`}`
`641`	`637`
`642`	`638`	`protected Response notFound(String msg) {`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,8 @@ private boolean shouldCreateGlobalId(DatasetVersion dsv) {`
`217`	`217`	`return !dsv.getDataset().isHarvested()`
`218`	`218`	`\|\| HarvestStyle.VDC.equals(harvestStyle)`
`219`	`219`	`\|\| HarvestStyle.ICPSR.equals(harvestStyle)`
`220`		`- \|\| HarvestStyle.DATAVERSE.equals(harvestStyle);`
	`220`	`+ \|\| HarvestStyle.DATAVERSE.equals(harvestStyle)`
	`221`	`+ \|\| HarvestStyle.DOI.equals(harvestStyle);`
`221`	`222`	`}`
`222`	`223`
`223`	`224`	`private Date extractCitationDate(DatasetVersion dsv) {`