Addendum for Export Refactoring PR

src/main/java/edu/harvard/iq/dataverse/DatasetPage.java

@@ -39,6 +39,7 @@
 import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
 import edu.harvard.iq.dataverse.export.ExportService;
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean;
 import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import io.gdcc.spi.export.ExportException;
@@ -255,6 +256,8 @@ public enum DisplayMode {
     DvObjectServiceBean dvObjectService;
     @EJB
     CacheFactoryBean cacheFactory;
+    @EJB
+    ExporterRegistryBean exporterRegistryService;
     @Inject
     DataverseRequestServiceBean dvRequestService;
     @Inject
@@ -7000,7 +7003,7 @@ public String getSignpostingLinkHeader() {
             return null;
         }
         if (signpostingLinkHeader == null) {
-            SignpostingResources sr = new SignpostingResources(systemConfig, workingVersion,
+            SignpostingResources sr = new SignpostingResources(systemConfig, exporterRegistryService, workingVersion,
                     JvmSettings.SIGNPOSTING_LEVEL1_AUTHOR_LIMIT.lookupOptional().orElse(""),
                     JvmSettings.SIGNPOSTING_LEVEL1_ITEM_LIMIT.lookupOptional().orElse(""));
             signpostingLinkHeader = sr.getLinks();

src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java

@@ -6,6 +6,8 @@
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.export.service.ExportServiceBean;
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean;
 import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.util.cache.CacheFactoryBean;
 import edu.harvard.iq.dataverse.engine.DataverseEngine;
@@ -209,6 +211,12 @@ public class EjbDataverseEngine {
     @EJB
     CacheFactoryBean cacheFactory;
 
+    @EJB
+    ExportServiceBean exportService;
+
+    @EJB
+    ExporterRegistryBean exporterRegistry;
+
     @Resource
     EJBContext ejbCtxt;
 
@@ -664,7 +672,17 @@ public MetadataBlockServiceBean metadataBlocks() {
                 public DatasetTypeServiceBean datasetTypes() {
                     return datasetTypeService;
                 }
-
+
+                @Override
+                public ExportServiceBean exportService() {
+                    return exportService;
+                }
+
+                @Override
+                public ExporterRegistryBean exporterRegistry() {
+                    return exporterRegistry;
+                }
+
                 @Override
                 public void beginCommandSequence() {
                     this.commandsCalled = new Stack();

src/main/java/edu/harvard/iq/dataverse/FilePage.java

@@ -24,9 +24,10 @@
 import edu.harvard.iq.dataverse.engine.command.impl.RestrictFileCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UningestFileCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
-import edu.harvard.iq.dataverse.export.ExportService;
+import edu.harvard.iq.dataverse.export.service.ExportServiceBean;
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean;
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean.Details;
 import io.gdcc.spi.export.ExportException;
-import io.gdcc.spi.export.Exporter;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
@@ -35,7 +36,6 @@
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.MakeDataCountLoggingServiceBean.MakeDataCountEntry;
 import edu.harvard.iq.dataverse.privateurl.PrivateUrlServiceBean;
-import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
@@ -63,7 +63,6 @@
 import jakarta.faces.application.FacesMessage;
 import jakarta.faces.component.UIComponent;
 import jakarta.faces.context.FacesContext;
-import jakarta.faces.validator.ValidatorException;
 import jakarta.faces.view.ViewScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
@@ -128,6 +127,10 @@ public class FilePage implements java.io.Serializable {
     IngestServiceBean ingestService;
     @EJB
     SystemConfig systemConfig;
+    @EJB
+    ExportServiceBean exportService;
+    @EJB
+    ExporterRegistryBean exporterRegistryService;
 
 
     @Inject
@@ -463,30 +466,19 @@ public void setVersion(String version) {
         this.version = version;
     }
 
-    public List< String[]> getExporters(){
-        List<String[]> retList = new ArrayList<>();
-        String myHostURL = systemConfig.getDataverseSiteUrl();
-        for (String [] provider : ExportService.getInstance().getExportersLabels() ){
-            String formatName = provider[1];
-            String formatDisplayName = provider[0];
-
-            Exporter exporter = null; 
-            try {
-                exporter = ExportService.getInstance().getExporter(formatName);
-            } catch (ExportException ex) {
-                exporter = null;
-            }
-            if (exporter != null && exporter.isAvailableToUsers()) {
-                // Not all metadata exports should be presented to the web users!
-                // Some are only for harvesting clients.
-
-                String[] temp = new String[2];
-                temp[0] = formatDisplayName;
-                temp[1] = myHostURL + "/api/datasets/export?exporter=" + formatName + "&persistentId=" + fileMetadata.getDatasetVersion().getDataset().getGlobalId().asString();
-                retList.add(temp);
-            }
-        }
-        return retList;  
+    public List<String[]> getExporters(){
+        String urlTemplate = systemConfig.getDataverseSiteUrl() + "/api/datasets/export?exporter=%s&persistentId=%s";
+
+        return exporterRegistryService.getDetails().stream()
+            .filter(Details::isAvailableToUsers)
+            .map(details -> new String[]{
+                details.localizedDisplayName(),
+                urlTemplate.formatted(
+                    details.formatName(),
+                    fileMetadata.getDatasetVersion().getDataset().getGlobalId().asString()
+                )
+            })
+            .toList();
     }
 
     public String saveProvFreeform(String freeformTextInput, DataFile dataFileFromPopup) throws CommandException {
@@ -637,15 +629,13 @@ public String uningestFile() throws CommandException {
         editDataset = file.getOwner();
         if (editDataset.isReleased()) {
             try {
-                ExportService instance = ExportService.getInstance();
-                instance.exportAllFormats(editDataset);
-
+                exportService.exportAllFormats(editDataset);
             } catch (ExportException ex) {
                 // Something went wrong!
                 // Just like with indexing, a failure to export is not a fatal
                 // condition. We'll just log the error as a warning and keep
                 // going:
-                logger.log(Level.WARNING, "Uningest: Exception while exporting:{0}", ex.getMessage());
+                logger.log(Level.WARNING, "Uningest: Exception while exporting: {0}", ex);
             }
         }
         datafileService.save(file);

src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java

@@ -22,6 +22,8 @@
 import edu.harvard.iq.dataverse.engine.command.impl.GetLatestAccessibleDatasetVersionCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.GetLatestPublishedDatasetVersionCommand;
 import edu.harvard.iq.dataverse.engine.command.impl.GetSpecificPublishedDatasetVersionCommand;
+import edu.harvard.iq.dataverse.export.service.ExportServiceBean;
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
 import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.makedatacount.DatasetMetricsServiceBean;
@@ -246,6 +248,12 @@ String getWrappedMessageWhenJson() {
 
     @EJB
     TemplateServiceBean templateSvc;
+
+    @EJB
+    ExportServiceBean exportSvc;
+
+    @EJB
+    ExporterRegistryBean exporterRegistrySvc;
 
     @Inject
     FailedPIDResolutionLoggingServiceBean fprLogService;

src/main/java/edu/harvard/iq/dataverse/api/Files.java

@@ -18,7 +18,6 @@
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
 import edu.harvard.iq.dataverse.engine.command.impl.*;
-import edu.harvard.iq.dataverse.export.ExportService;
 import io.gdcc.spi.export.ExportException;
 import edu.harvard.iq.dataverse.externaltools.ExternalTool;
 import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
@@ -60,7 +59,6 @@
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
 
 import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*;
 import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST;
@@ -888,8 +886,7 @@ public Response extractNcml(@Context ContainerRequestContext crc, @Parameter(des
     private void exportDatasetMetadata(SettingsServiceBean settingsServiceBean, Dataset theDataset) {
 
         try {
-            ExportService instance = ExportService.getInstance();
-            instance.exportAllFormats(theDataset);
+            exportSvc.exportAllFormats(theDataset);
 
         } catch (ExportException ex) {
             // Something went wrong!

src/main/java/edu/harvard/iq/dataverse/api/Info.java

@@ -2,20 +2,17 @@
 
 import java.util.logging.Logger;
 import edu.harvard.iq.dataverse.customization.CustomizationConstants;
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean;
 import edu.harvard.iq.dataverse.util.json.JsonUtil;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
 import jakarta.ws.rs.client.WebTarget;
-import edu.harvard.iq.dataverse.export.ExportService;
 import edu.harvard.iq.dataverse.settings.JvmSettings;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
-import io.gdcc.spi.export.Exporter;
-import io.gdcc.spi.export.ExportException;
 import io.gdcc.spi.export.XMLExporter;
 import jakarta.ejb.EJB;
-import jakarta.json.Json;
 import jakarta.json.JsonObjectBuilder;
 import jakarta.json.JsonValue;
 import jakarta.ws.rs.core.MediaType;
@@ -149,24 +146,21 @@ public Response getZipDownloadLimit() {
             description = "Returns dataset export formats with display name, media type, harvestability, user-interface visibility, and XML metadata when available.")
     public Response getExportFormats() {
         JsonObjectBuilder responseModel = JsonUtil.createObjectBuilder();
-        ExportService instance = ExportService.getInstance();
-        for (String[] labels : instance.getExportersLabels()) {
-            try {
-                Exporter exporter = instance.getExporter(labels[1]);
-                JsonObjectBuilder exporterObject = JsonUtil.createObjectBuilder().add("displayName", labels[0])
-                        .add("mediaType", exporter.getMediaType()).add("isHarvestable", exporter.isHarvestable())
-                        .add("isVisibleInUserInterface", exporter.isAvailableToUsers());
-                if (exporter instanceof XMLExporter xmlExporter) {
-                    exporterObject.add("XMLNameSpace", xmlExporter.getXMLNameSpace())
-                            .add("XMLSchemaLocation", xmlExporter.getXMLSchemaLocation())
-                            .add("XMLSchemaVersion", xmlExporter.getXMLSchemaVersion());
-                }
-                responseModel.add(labels[1], exporterObject);
-            }
-            catch (ExportException ex){
-                logger.warning("Failed to get: " + labels[1]);
-                logger.warning(ex.getLocalizedMessage());
+
+        for (ExporterRegistryBean.Details exporterDetail : exporterRegistrySvc.getDetails()) {
+            JsonObjectBuilder exporterObject = JsonUtil.createObjectBuilder()
+                .add("displayName", exporterDetail.localizedDisplayName())
+                .add("mediaType", exporterDetail.mediaType())
+                .add("isHarvestable", exporterDetail.isHarvestable())
+                .add("isVisibleInUserInterface", exporterDetail.isAvailableToUsers());
+
+            if (exporterRegistrySvc.get(exporterDetail) instanceof XMLExporter xmlExporter) {
+                exporterObject.add("XMLNameSpace", xmlExporter.getXMLNameSpace())
+                    .add("XMLSchemaLocation", xmlExporter.getXMLSchemaLocation())
+                    .add("XMLSchemaVersion", xmlExporter.getXMLSchemaVersion());
             }
+
+            responseModel.add(exporterDetail.formatName(), exporterObject);
         }
         return ok(responseModel);
     }

src/main/java/edu/harvard/iq/dataverse/api/Metadata.java

@@ -7,10 +7,11 @@
 
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.DatasetServiceBean;
-import edu.harvard.iq.dataverse.export.ExportService;
 
 import java.util.Date;
 import java.util.logging.Logger;
+
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean;
 import jakarta.ejb.EJB;
 import jakarta.ws.rs.*;
 
@@ -23,6 +24,8 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
+
 import org.eclipse.microprofile.openapi.annotations.Operation;
 import org.eclipse.microprofile.openapi.annotations.parameters.Parameter;
 import org.eclipse.microprofile.openapi.annotations.tags.Tag;
@@ -167,18 +170,10 @@ private List<String> validateFormatNames(String formats) {
 
         List<String> formatNames = new ArrayList<>(Arrays.asList(formats.split(",")));
 
-        Set<String> supportedFormatNames = new HashSet<>();
-        for (String[] providerLabels : ExportService.getInstance().getExportersLabels()) {
-            supportedFormatNames.add(providerLabels[1]);
-        }
-
-        //for (String formatName : formatNames) {
-        //    if (!supportedFormatNames.contains(formatName)) {
-        //        throw new BadRequestException(formatName + " is not a supported format");
-        //    }
-        //}
-        if (!supportedFormatNames.containsAll(formatNames)) {
-            throw new BadRequestException("Invalid/unsupported format name(s)");
+        try {
+            exporterRegistrySvc.requireAllExist(formatNames);
+        } catch (IllegalArgumentException ex) {
+            throw new BadRequestException("Invalid/unsupported format name(s)" + ex.getMessage());
         }
 
         return formatNames;

src/main/java/edu/harvard/iq/dataverse/engine/command/CommandContext.java

@@ -4,6 +4,8 @@
 import edu.harvard.iq.dataverse.dataset.DatasetFieldsValidator;
 import edu.harvard.iq.dataverse.authorization.providers.builtin.BuiltinUserServiceBean;
 import edu.harvard.iq.dataverse.dataverse.featured.DataverseFeaturedItemServiceBean;
+import edu.harvard.iq.dataverse.export.service.ExportServiceBean;
+import edu.harvard.iq.dataverse.export.service.ExporterRegistryBean;
 import edu.harvard.iq.dataverse.license.LicenseServiceBean;
 import edu.harvard.iq.dataverse.search.IndexServiceBean;
 import edu.harvard.iq.dataverse.search.SearchService;
@@ -143,4 +145,8 @@ public interface CommandContext {
     public DatasetFieldsValidator datasetFieldsValidator();
 
     public LicenseServiceBean licenses();
+
+    public ExportServiceBean exportService();
+
+    public ExporterRegistryBean exporterRegistry();
 }

src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CuratePublishedDatasetVersionCommand.java

@@ -6,7 +6,6 @@
 import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
 import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
 import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
-import edu.harvard.iq.dataverse.export.ExportService;
 import io.gdcc.spi.export.ExportException;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
@@ -249,8 +248,7 @@ public boolean onSuccess(CommandContext ctxt, Object r) {
 
         // And the exported metadata files
         try {
-            ExportService instance = ExportService.getInstance();
-            instance.exportAllFormats(d);
+            ctxt.exportService().exportAllFormats(d);
         } catch (ExportException ex) {
             // Just like with indexing, a failure to export is not a fatal condition.
             retVal = false;