Code modifications per code review. (#4865)

IQSS · Aug 3, 2018 · 5c967f0 · 5c967f0
1 parent 29a257f
commit 5c967f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 29 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Files.java b/src/main/java/edu/harvard/iq/dataverse/api/Files.java
@@ -337,9 +337,9 @@ public Response uningestDatafile(@PathParam("id") String id) {
     // for tabular ingest. It can be used on non-tabular datafiles; to try to 
     // ingest a file that has previously failed ingest, or to ingest a file of a
     // type for which ingest was not previously supported. 
-    // It will also be possible to *force* reingest of a datafile that's already
-    // ingested as Tabular data; for example, to address a bug that has been 
-    // found in an ingest plugin. 
+    // We are considering making it possible, in the future, to reingest 
+    // a datafile that's already ingested as Tabular; for example, to address a 
+    // bug that has been found in an ingest plugin. 
 
     @Path("{id}/reingest")
     @POST
@@ -359,17 +359,9 @@ public Response reingest(@PathParam("id") String id) {
         try {
             dataFile = findDataFileOrDie(id);
         } catch (WrappedResponse ex) {
-            dataFile = null;
-        }
-
-        if (dataFile == null) {
             return error(Response.Status.NOT_FOUND, "File not found for given id.");
         }
 
-        if (dataFile.isTabularData()) {
-            return error(Response.Status.BAD_REQUEST, "Datafile already ingested as Tabular (as of now, this API only works on uningested datafiles).");
-        }
-
         Dataset dataset = dataFile.getOwner();
 
         if (dataset == null) {
@@ -387,13 +379,9 @@ public Response reingest(@PathParam("id") String id) {
         }
 
         dataFile.SetIngestScheduled();
-
-        IngestRequest ingestRequest = dataFile.getIngestRequest();
-
-        if (ingestRequest == null) {
-            ingestRequest = new IngestRequest();
-            ingestRequest.setDataFile(dataFile);
-            dataFile.setIngestRequest(ingestRequest);
+
+        if (dataFile.getIngestRequest() == null) {
+            dataFile.setIngestRequest(new IngestRequest(dataFile));
         }
 
         dataFile.getIngestRequest().setForceTypeCheck(true);

diff --git a/src/main/java/edu/harvard/iq/dataverse/ingest/IngestRequest.java b/src/main/java/edu/harvard/iq/dataverse/ingest/IngestRequest.java
@@ -50,6 +50,13 @@ public void setId(Long id) {
 
     private Boolean forceTypeCheck;
 
+    public IngestRequest() {
+    }
+
+    public IngestRequest(DataFile dataFile) {
+        this.dataFile = dataFile;
+    }
+
     public DataFile getDataFile() {
         return dataFile;
     }

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
@@ -86,16 +86,6 @@ public class FileUtil implements java.io.Serializable  {
     private static final Logger logger = Logger.getLogger(FileUtil.class.getCanonicalName());
 
     private static final String[] TABULAR_DATA_FORMAT_SET = {"POR", "SAV", "DTA", "RDA"};
-    // The list of formats for which we need to re-test, if we want to attempt 
-    // to ingest the file again:
-    // Example: We have added support for Stata-13+; the new ingest plugin is called
-    // when the file type is detected as "application/x-stata-1[345]". But the 
-    // previously uploaded, but not ingested stata files are in the database
-    // typed as "application/x-stata". So we want to run the new-and-improved
-    // DTA check that will re-identify the specific DTA flavor. 
-    // If similar cases are introduced in the future, the affected formats will
-    // need to be added to the list. 
-    private static final String[] TABULAR_DATA_FORMATS_RETEST = {"DTA"};
 
     private static Map<String, String> STATISTICAL_FILE_EXTENSION = new HashMap<String, String>();
 
@@ -291,7 +281,7 @@ private static String determineContentType(File fileObject) {
     }
 
     public static String retestIngestableFileType(File file, String fileType) {
-        IngestableDataChecker tabChecker = new IngestableDataChecker(TABULAR_DATA_FORMATS_RETEST);
+        IngestableDataChecker tabChecker = new IngestableDataChecker(TABULAR_DATA_FORMAT_SET);
         String newType = tabChecker.detectTabularDataFormat(file);
 
         return newType != null ? newType : fileType;