Merge branch 'develop' into 4813-allow-duplicate-files

IQSS · Jul 14, 2020 · dab96ab · dab96ab
2 parents 77ad2e3 + 378aaad
commit dab96ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/doc/sphinx-guides/source/user/account.rst b/doc/sphinx-guides/source/user/account.rst
@@ -158,10 +158,10 @@ Notifications appear in the notifications tab on your account page and are also
 
 You will receive a notification when:
 
-- You've created your account
-- You've created a dataverse or added a dataset
-- Another Dataverse user has requested access to a restricted file in one of your datasets
-- A file in one of your datasets has finished the ingest process
+- You've created your account.
+- You've created a dataverse or added a dataset.
+- Another Dataverse user has requested access to restricted files in a dataset that you published. (If you submitted your dataset for review and it was published by a curator, the curators of the dataverse that contains your dataset will get a notification about requests to access your restricted files.)
+- A file in one of your datasets has finished the ingest process.
 
 Notifications will only be emailed one time even if you haven't read the notification on the Dataverse site.
 

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
@@ -394,7 +394,10 @@ private List<DatasetField> parseFieldsFromArray(JsonArray fieldsArray, Boolean t
             List<DatasetField> fields = new LinkedList<>();
             for (JsonObject fieldJson : fieldsArray.getValuesAs(JsonObject.class)) {
                 try {
-                    fields.add(parseField(fieldJson, testType));
+                    DatasetField field = parseField(fieldJson, testType);
+                    if (field != null) {
+                        fields.add(field);
+                    }
                 } catch (CompoundVocabularyException ex) {
                     DatasetFieldType fieldType = datasetFieldSvc.findByNameOpt(fieldJson.getString("typeName", ""));
                     if (lenient && (DatasetFieldConstant.geographicCoverage).equals(fieldType.getName())) {
@@ -566,7 +569,8 @@ public DatasetField parseField(JsonObject json, Boolean testType) throws JsonPar
 
 
         if (type == null) {
-            throw new JsonParseException("Can't find type '" + json.getString("typeName", "") + "'");
+            logger.fine("Can't find type '" + json.getString("typeName", "") + "'");
+            return null;
         }
         if (testType && type.isAllowMultiples() != json.getBoolean("multiple")) {
             throw new JsonParseException("incorrect multiple   for field " + json.getString("typeName", ""));

diff --git a/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java b/src/test/java/edu/harvard/iq/dataverse/util/json/JsonParserTest.java
@@ -433,12 +433,12 @@ public void testParseEmptyDataset() throws JsonParseException {
 
     /**
      * 
-     * Expect an exception when the dataset version JSON contains fields
+     * Expect no exception when the dataset version JSON contains fields
      * that the {@link DatasetFieldService} doesn't know about.
-     * @throws JsonParseException as expected
+     * @throws JsonParseException should not happen here
      * @throws IOException when test file IO goes wrong - this is bad.
      */
-    @Test(expected = JsonParseException.class)
+    @Test
     public void testParseOvercompleteDatasetVersion() throws JsonParseException, IOException {
         JsonObject dsJson;
         try (InputStream jsonFile = ClassLoader.getSystemResourceAsStream("json/complete-dataset-version.json")) {