rename "ownerDataverse" to "dataverse", remove TODOs #10519

IQSS · Nov 5, 2024 · 4c45fc0 · 4c45fc0
1 parent a7eee45
commit 4c45fc0
Showing 1 changed file with 6 additions and 8 deletions.
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
@@ -599,11 +599,10 @@ public static JsonArrayBuilder json(List<MetadataBlock> metadataBlocks, boolean
         return json(metadataBlocks, returnDatasetFieldTypes, printOnlyDisplayedOnCreateDatasetFieldTypes, null, null);
     }
 
-    // TODO: consider renaming "ownerDataverse" to just "dataverse"
-    public static JsonArrayBuilder json(List<MetadataBlock> metadataBlocks, boolean returnDatasetFieldTypes, boolean printOnlyDisplayedOnCreateDatasetFieldTypes, Dataverse ownerDataverse, DatasetType datasetType) {
+    public static JsonArrayBuilder json(List<MetadataBlock> metadataBlocks, boolean returnDatasetFieldTypes, boolean printOnlyDisplayedOnCreateDatasetFieldTypes, Dataverse dataverse, DatasetType datasetType) {
         JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
         for (MetadataBlock metadataBlock : metadataBlocks) {
-            arrayBuilder.add(returnDatasetFieldTypes ? json(metadataBlock, printOnlyDisplayedOnCreateDatasetFieldTypes, ownerDataverse, datasetType) : brief.json(metadataBlock));
+            arrayBuilder.add(returnDatasetFieldTypes ? json(metadataBlock, printOnlyDisplayedOnCreateDatasetFieldTypes, dataverse, datasetType) : brief.json(metadataBlock));
         }
         return arrayBuilder;
     }
@@ -634,8 +633,7 @@ public static JsonObjectBuilder json(MetadataBlock metadataBlock) {
         return json(metadataBlock, false, null, null);
     }
 
-    // TODO: consider renaming "ownerDataverse" to just "dataverse"
-    public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printOnlyDisplayedOnCreateDatasetFieldTypes, Dataverse ownerDataverse, DatasetType datasetType) {
+    public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printOnlyDisplayedOnCreateDatasetFieldTypes, Dataverse dataverse, DatasetType datasetType) {
         JsonObjectBuilder jsonObjectBuilder = jsonObjectBuilder()
                 .add("id", metadataBlock.getId())
                 .add("name", metadataBlock.getName())
@@ -644,9 +642,9 @@ public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printO
 
         Set<DatasetFieldType> datasetFieldTypes;
 
-        if (ownerDataverse != null) {
+        if (dataverse != null) {
             datasetFieldTypes = new TreeSet<>(datasetFieldService.findAllInMetadataBlockAndDataverse(
-                    metadataBlock, ownerDataverse, printOnlyDisplayedOnCreateDatasetFieldTypes, datasetType));
+                    metadataBlock, dataverse, printOnlyDisplayedOnCreateDatasetFieldTypes, datasetType));
         } else {
             datasetFieldTypes = printOnlyDisplayedOnCreateDatasetFieldTypes
                     ? new TreeSet<>(datasetFieldService.findAllDisplayedOnCreateInMetadataBlock(metadataBlock))
@@ -655,7 +653,7 @@ public static JsonObjectBuilder json(MetadataBlock metadataBlock, boolean printO
 
         JsonObjectBuilder fieldsBuilder = Json.createObjectBuilder();
         for (DatasetFieldType datasetFieldType : datasetFieldTypes) {
-            fieldsBuilder.add(datasetFieldType.getName(), json(datasetFieldType, ownerDataverse));
+            fieldsBuilder.add(datasetFieldType.getName(), json(datasetFieldType, dataverse));
         }
 
         jsonObjectBuilder.add("fields", fieldsBuilder);