get rid of unneeded null checks #10517

These days the field is non-null able and we prevent deletion of the default dataset type.
IQSS · Aug 13, 2024 · 1a834de · 1a834de
1 parent eb20155
commit 1a834de
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractCreateDatasetCommand.java
@@ -122,9 +122,6 @@ public Dataset execute(CommandContext ctxt) throws CommandException {
         handlePid(theDataset, ctxt);
 
         DatasetType defaultDatasetType = ctxt.datasetTypes().getByName(DatasetType.DEFAULT_DATASET_TYPE);
-        if (defaultDatasetType == null) {
-            throw new CommandException("Couldn't find default dataset type: " + DatasetType.DEFAULT_DATASET_TYPE, this);
-        }
         DatasetType existingDatasetType = theDataset.getDatasetType();
         logger.fine("existing dataset type: " + existingDatasetType);
         if (existingDatasetType != null) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/IndexServiceBean.java
@@ -1004,9 +1004,7 @@ public SolrInputDocuments toSolrDocs(IndexableDataset indexableDataset, Set<Long
         }
 
         DatasetType datasetType = dataset.getDatasetType();
-        if (datasetType != null) {
-            solrInputDocument.addField(SearchFields.DATASET_TYPE, datasetType.getName());
-        }
+        solrInputDocument.addField(SearchFields.DATASET_TYPE, datasetType.getName());
 
         DatasetVersion datasetVersion = indexableDataset.getDatasetVersion();
         String parentDatasetTitle = "TBD";

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java
@@ -643,9 +643,7 @@ public SolrQueryResponse search(
                 if (authors != null) {
                     solrSearchResult.setDatasetAuthors(authors);
                 }
-                if (datasetType != null) {
-                    solrSearchResult.setDatasetType(datasetType);
-                }
+                solrSearchResult.setDatasetType(datasetType);
             } else if (type.equals("files")) {
                 String parentGlobalId = null;
                 Object parentGlobalIdObject = solrDocument.getFieldValue(SearchFields.PARENT_IDENTIFIER);

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JSONLDUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JSONLDUtil.java
@@ -104,9 +104,6 @@ public static Dataset updateDatasetMDFromJsonLD(Dataset ds, String jsonLDBody,
                 String datasetTypeIn = jsonObject.getString("datasetType", null);
                 logger.fine("datasetTypeIn: " + datasetTypeIn);
                 DatasetType defaultDatasetType = datasetTypeSvc.getByName(DatasetType.DEFAULT_DATASET_TYPE);
-                if (defaultDatasetType == null) {
-                    throw new RuntimeException("Couldn't find default dataset type: " + DatasetType.DEFAULT_DATASET_TYPE);
-                }
                 if (datasetTypeIn == null) {
                     ds.setDatasetType(defaultDatasetType);
                 } else {

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
@@ -333,9 +333,6 @@ public Dataset parseDataset(JsonObject obj) throws JsonParseException {
             throw new JsonParseException("Specified metadatalanguage not allowed.");
         }
         DatasetType defaultDatasetType = datasetTypeService.getByName(DatasetType.DEFAULT_DATASET_TYPE);
-        if (defaultDatasetType == null) {
-            throw new JsonParseException("Couldn't find default dataset type: " + DatasetType.DEFAULT_DATASET_TYPE);
-        }
         String datasetTypeIn = obj.getString("datasetType", null);
         logger.fine("datasetTypeIn: " + datasetTypeIn);
         if (datasetTypeIn == null) {

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonPrinter.java
@@ -406,10 +406,7 @@ public static JsonObjectBuilder json(Dataset ds, Boolean returnOwners) {
         if (returnOwners){
             bld.add("isPartOf", getOwnersFromDvObject(ds));
         }
-        DatasetType datasetType = ds.getDatasetType();
-        if (datasetType != null) {
-            bld.add("datasetType", datasetType.getName());
-        }
+        bld.add("datasetType", ds.getDatasetType().getName());
         return bld;
     }
 

diff --git a/src/test/java/edu/harvard/iq/dataverse/search/IndexServiceBeanTest.java b/src/test/java/edu/harvard/iq/dataverse/search/IndexServiceBeanTest.java
@@ -3,6 +3,7 @@
 import edu.harvard.iq.dataverse.*;
 import edu.harvard.iq.dataverse.Dataverse.DataverseType;
 import edu.harvard.iq.dataverse.branding.BrandingUtil;
+import edu.harvard.iq.dataverse.dataset.DatasetType;
 import edu.harvard.iq.dataverse.mocks.MocksFactory;
 import edu.harvard.iq.dataverse.pidproviders.doi.AbstractDOIProvider;
 import edu.harvard.iq.dataverse.settings.JvmSettings;
@@ -142,6 +143,9 @@ private IndexableDataset createIndexableDataset() {
         datasetVersion.getDatasetFields().add(field);
         final IndexableDataset indexableDataset = new IndexableDataset(datasetVersion);
         indexableDataset.getDatasetVersion().getDataset().setOwner(dataverse);
+        DatasetType datasetType = new DatasetType();
+        datasetType.setName(DatasetType.DEFAULT_DATASET_TYPE);
+        indexableDataset.getDatasetVersion().getDataset().setDatasetType(datasetType);
         return indexableDataset;
     }