Skip to content

Commit 4016a3d

Browse files
committed
chore: migrate simple imports of Exporter and ExportException IQSS#9175
1 parent 33f5591 commit 4016a3d

10 files changed

Lines changed: 20 additions & 21 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package edu.harvard.iq.dataverse;
22

3+
import edu.harvard.iq.dataverse.export.ExportService;
34
import edu.harvard.iq.dataverse.provenance.ProvPopupFragmentBean;
45
import edu.harvard.iq.dataverse.api.AbstractApiBean;
56
import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
@@ -33,9 +34,6 @@
3334
import edu.harvard.iq.dataverse.engine.command.impl.PublishDatasetCommand;
3435
import edu.harvard.iq.dataverse.engine.command.impl.PublishDataverseCommand;
3536
import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
36-
import edu.harvard.iq.dataverse.export.ExportException;
37-
import edu.harvard.iq.dataverse.export.ExportService;
38-
import edu.harvard.iq.dataverse.export.spi.Exporter;
3937
import edu.harvard.iq.dataverse.ingest.IngestRequest;
4038
import edu.harvard.iq.dataverse.ingest.IngestServiceBean;
4139
import edu.harvard.iq.dataverse.license.LicenseServiceBean;
@@ -88,6 +86,8 @@
8886
import javax.inject.Inject;
8987
import javax.inject.Named;
9088

89+
import io.gdcc.dataverse.extension.exceptions.ExportException;
90+
import io.gdcc.dataverse.extension.spi.Exporter;
9191
import org.apache.commons.lang3.StringUtils;
9292
import org.primefaces.event.FileUploadEvent;
9393
import org.primefaces.model.file.UploadedFile;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
import edu.harvard.iq.dataverse.engine.command.impl.PersistProvFreeFormCommand;
2323
import edu.harvard.iq.dataverse.engine.command.impl.RestrictFileCommand;
2424
import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
25-
import edu.harvard.iq.dataverse.export.ExportException;
2625
import edu.harvard.iq.dataverse.export.ExportService;
27-
import edu.harvard.iq.dataverse.export.spi.Exporter;
2826
import edu.harvard.iq.dataverse.externaltools.ExternalTool;
2927
import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
3028
import edu.harvard.iq.dataverse.externaltools.ExternalToolServiceBean;
@@ -59,6 +57,8 @@
5957
import javax.inject.Named;
6058
import javax.validation.ConstraintViolation;
6159

60+
import io.gdcc.dataverse.extension.exceptions.ExportException;
61+
import io.gdcc.dataverse.extension.spi.Exporter;
6262
import org.primefaces.PrimeFaces;
6363
import org.primefaces.component.tabview.TabView;
6464
import org.primefaces.event.TabChangeEvent;
@@ -341,7 +341,7 @@ public List< String[]> getExporters(){
341341
String formatName = provider[1];
342342
String formatDisplayName = provider[0];
343343

344-
Exporter exporter = null;
344+
Exporter exporter = null;
345345
try {
346346
exporter = ExportService.getInstance().getExporter(formatName);
347347
} catch (ExportException ex) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import edu.harvard.iq.dataverse.engine.command.impl.RestrictFileCommand;
3131
import edu.harvard.iq.dataverse.engine.command.impl.UningestFileCommand;
3232
import edu.harvard.iq.dataverse.engine.command.impl.UpdateDatasetVersionCommand;
33-
import edu.harvard.iq.dataverse.export.ExportException;
3433
import edu.harvard.iq.dataverse.export.ExportService;
3534
import edu.harvard.iq.dataverse.externaltools.ExternalTool;
3635
import edu.harvard.iq.dataverse.externaltools.ExternalToolHandler;
@@ -71,6 +70,8 @@
7170
import javax.ws.rs.core.Response;
7271
import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
7372
import javax.ws.rs.core.UriInfo;
73+
74+
import io.gdcc.dataverse.extension.exceptions.ExportException;
7475
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
7576
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
7677
import org.glassfish.jersey.media.multipart.FormDataParam;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package edu.harvard.iq.dataverse.engine.command.impl;
22

33
import edu.harvard.iq.dataverse.authorization.Permission;
4-
import edu.harvard.iq.dataverse.datavariable.VarGroup;
54
import edu.harvard.iq.dataverse.engine.command.CommandContext;
65
import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
76
import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
87
import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
98
import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
10-
import edu.harvard.iq.dataverse.export.ExportException;
119
import edu.harvard.iq.dataverse.export.ExportService;
1210
import edu.harvard.iq.dataverse.util.BundleUtil;
1311
import edu.harvard.iq.dataverse.util.DatasetFieldUtil;
@@ -19,8 +17,8 @@
1917
import edu.harvard.iq.dataverse.FileMetadata;
2018
import edu.harvard.iq.dataverse.DataFileCategory;
2119
import edu.harvard.iq.dataverse.DatasetVersionDifference;
20+
import io.gdcc.dataverse.extension.exceptions.ExportException;
2221

23-
import java.util.Collection;
2422
import java.util.List;
2523
import java.util.logging.Level;
2624
import java.util.logging.Logger;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
1616
import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
1717
import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
18-
import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException;
19-
import edu.harvard.iq.dataverse.export.ExportException;
2018
import edu.harvard.iq.dataverse.export.ExportService;
21-
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
22-
import edu.harvard.iq.dataverse.util.BundleUtil;
19+
2320
import java.io.IOException;
2421
import java.util.logging.Logger;
2522
import edu.harvard.iq.dataverse.batch.util.LoggingUtil;
2623
import java.util.concurrent.Future;
24+
25+
import io.gdcc.dataverse.extension.exceptions.ExportException;
2726
import org.apache.solr.client.solrj.SolrServerException;
2827

2928
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
1010
import edu.harvard.iq.dataverse.engine.command.RequiredPermissions;
1111
import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
12-
import edu.harvard.iq.dataverse.export.ExportException;
1312
import edu.harvard.iq.dataverse.export.ExportService;
1413
import edu.harvard.iq.dataverse.util.EjbUtil;
1514
import edu.harvard.iq.dataverse.util.FileUtil;
15+
import io.gdcc.dataverse.extension.exceptions.ExportException;
1616

1717
import java.io.File;
1818
import java.io.FileOutputStream;

src/main/java/edu/harvard/iq/dataverse/export/ExportService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import static edu.harvard.iq.dataverse.dataaccess.DataAccess.getStorageIO;
1111
import edu.harvard.iq.dataverse.dataaccess.DataAccessOption;
1212
import edu.harvard.iq.dataverse.dataaccess.StorageIO;
13-
import edu.harvard.iq.dataverse.export.spi.Exporter;
14-
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
1513
import edu.harvard.iq.dataverse.util.json.JsonPrinter;
1614
import java.io.BufferedReader;
1715
import java.io.File;
@@ -41,6 +39,8 @@
4139
import javax.json.JsonObjectBuilder;
4240
import javax.ws.rs.core.MediaType;
4341

42+
import io.gdcc.dataverse.extension.exceptions.ExportException;
43+
import io.gdcc.dataverse.extension.spi.Exporter;
4444
import org.apache.commons.io.IOUtils;
4545

4646
/**

src/main/java/edu/harvard/iq/dataverse/harvest/server/OAIRecordServiceBean.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
import edu.harvard.iq.dataverse.Dataset;
99
import edu.harvard.iq.dataverse.DatasetServiceBean;
1010
import edu.harvard.iq.dataverse.DatasetVersion;
11-
import edu.harvard.iq.dataverse.export.ExportException;
1211
import edu.harvard.iq.dataverse.export.ExportService;
1312
import edu.harvard.iq.dataverse.search.IndexServiceBean;
1413
import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
14+
import io.gdcc.dataverse.extension.exceptions.ExportException;
15+
1516
import java.time.Instant;
1617
import java.io.File;
1718
import java.io.IOException;

src/main/java/edu/harvard/iq/dataverse/harvest/server/web/servlet/OAIServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
package edu.harvard.iq.dataverse.harvest.server.web.servlet;
77

8+
import io.gdcc.dataverse.extension.exceptions.ExportException;
9+
import io.gdcc.dataverse.extension.spi.Exporter;
810
import io.gdcc.xoai.dataprovider.DataProvider;
911
import io.gdcc.xoai.dataprovider.repository.Repository;
1012
import io.gdcc.xoai.dataprovider.repository.RepositoryConfiguration;
@@ -20,9 +22,7 @@
2022
import io.gdcc.xoai.xml.XmlWriter;
2123
import edu.harvard.iq.dataverse.DatasetServiceBean;
2224
import edu.harvard.iq.dataverse.DataverseServiceBean;
23-
import edu.harvard.iq.dataverse.export.ExportException;
2425
import edu.harvard.iq.dataverse.export.ExportService;
25-
import edu.harvard.iq.dataverse.export.spi.Exporter;
2626
import edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean;
2727
import edu.harvard.iq.dataverse.harvest.server.OAISetServiceBean;
2828
import edu.harvard.iq.dataverse.harvest.server.xoai.DataverseXoaiItemRepository;

src/main/java/edu/harvard/iq/dataverse/harvest/server/xoai/DataverseXoaiItemRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package edu.harvard.iq.dataverse.harvest.server.xoai;
22

3+
import io.gdcc.dataverse.extension.exceptions.ExportException;
34
import io.gdcc.xoai.dataprovider.exceptions.handler.IdDoesNotExistException;
45
import io.gdcc.xoai.dataprovider.filter.ScopedFilter;
56
import io.gdcc.xoai.dataprovider.model.Item;
@@ -9,7 +10,6 @@
910
import io.gdcc.xoai.dataprovider.repository.ItemRepository;
1011
import edu.harvard.iq.dataverse.Dataset;
1112
import edu.harvard.iq.dataverse.DatasetServiceBean;
12-
import edu.harvard.iq.dataverse.export.ExportException;
1313
import edu.harvard.iq.dataverse.export.ExportService;
1414
import edu.harvard.iq.dataverse.harvest.server.OAIRecord;
1515
import edu.harvard.iq.dataverse.harvest.server.OAIRecordServiceBean;

0 commit comments

Comments
 (0)