Fixes external api subject field

The subject field of the external api had a custom type iterable_text,
this is now replaced with mixed_text.

Author: geichelberger

modules/elasticsearch-index/src/test/java/org/opencastproject/elasticsearch/index/objects/series/SeriesTest.java

@@ -56,7 +56,7 @@ public class SeriesTest {
   private static final String ORGANIZERS_JSON_KEY = "organizers";
   private static final String ORGANIZER_JSON_KEY = "organizer";
   private static final String SERIES_JSON_KEY = "series";
-  private static final String SUBJECT_JSON_KEY = "subject";
+  private static final String SUBJECTS_JSON_KEY = "subjects";
   private static final String TITLE_JSON_KEY = "title";
 
   private String id = "10.0000-1";
@@ -129,7 +129,7 @@ public void testToJson() throws ParseException {
     assertEquals(id, seriesJsonObject.get(IDENTIFIER_JSON_KEY));
     assertEquals(title, seriesJsonObject.get(TITLE_JSON_KEY));
     assertEquals(description, seriesJsonObject.get(DESCRIPTION_JSON_KEY));
-    assertEquals(subjects, seriesJsonObject.get(SUBJECT_JSON_KEY));
+    assertEquals(subjects, seriesJsonObject.get(SUBJECTS_JSON_KEY));
     assertEquals(organization, seriesJsonObject.get(ORGANIZATION_JSON_KEY));
     assertEquals(language, seriesJsonObject.get(LANGUAGE_JSON_KEY));
     assertEquals(creator, seriesJsonObject.get(CREATOR_JSON_KEY));

modules/elasticsearch-index/src/test/resources/adminui_event_metadata.json

@@ -7,7 +7,10 @@
       },
       "end_date":"2008-03-16T14:00:00Z",
       "title":"Land and Vegetation: Key players on the Climate Scene",
-      "subject": ["This is the subject"],
+      "subjects": [
+         "This is the subject",
+         "This is another subject"
+      ],
       "description":"This is the description for this event.",
       "publications":{
          "engage":"engage.html?e=p-1",

modules/elasticsearch-index/src/test/resources/adminui_series_metadata.json

@@ -7,7 +7,10 @@
       },
       "end_date":"2008-03-16T14:00:00Z",
       "title":"Land and Vegetation: Key players on the Climate Scene",
-      "subject":["This is the subject"],
+      "subjects":[
+         "This is the subject",
+         "This is another subject"
+      ],
       "description":"This is the description for this series.",
       "publications":{
          "engage":"engage.html?e=p-1",

modules/external-api/src/main/java/org/opencastproject/external/endpoint/EventsEndpoint.java

@@ -1787,9 +1787,17 @@ public Response updateEventMetadataByType(@HeaderParam("Accept") String acceptHe
             return error.get();
           }
           collection.removeField(field);
-          JSONArray subjectArray = (JSONArray) parser.parse(updatedFields.get(key));
-          collection.addField(
-                  MetadataJson.copyWithDifferentJsonValue(field, StringUtils.join(subjectArray.iterator(), ",")));
+          collection.addField(MetadataJson.copyWithDifferentJsonValue(field, updatedFields.get(key)));
+        } else if ("subject".equals(key)) {
+          MetadataField field = collection.getOutputFields().get(DublinCore.PROPERTY_SUBJECT.getLocalName());
+          Optional<Response> error = validateField(field, key, id, type, updatedFields);
+          if (error.isPresent()) {
+            return error.get();
+          }
+          collection.removeField(field);
+          JSONArray a = new JSONArray();
+          a.addAll(List.of(updatedFields.get(key).split(",")));
+          collection.addField(MetadataJson.copyWithDifferentJsonValue(field, a.toJSONString()));
         } else if ("startDate".equals(key)) {
           // Special handling for start date since in API v1 we expect start date and start time to be separate fields.
           MetadataField field = collection.getOutputFields().get(key);

modules/external-api/src/main/java/org/opencastproject/external/endpoint/SeriesEndpoint.java

@@ -798,8 +798,18 @@ public Response updateSeriesMetadata(@HeaderParam("Accept") String acceptHeader,
                 "The series metadata field with id '%s' and the metadata type '%s' is required and can not be empty!.",
                 key, type));
       }
-      collection.removeField(field);
-      collection.addField(MetadataJson.copyWithDifferentJsonValue(field, updatedFields.get(key)));
+      if ("subject".equals(key)) {
+        collection.removeField(field);
+        JsonArray subjects = splitSubjectIntoArray(updatedFields.get(key));
+        collection.addField(MetadataJson.copyWithDifferentJsonValue(
+            field,
+            subjects.toString()
+            )
+        );
+      } else {
+        collection.removeField(field);
+        collection.addField(MetadataJson.copyWithDifferentJsonValue(field, updatedFields.get(key)));
+      }
     }
 
     metadataList.add(adapter, collection);

modules/external-api/src/main/java/org/opencastproject/external/util/ExternalMetadataUtils.java

@@ -43,8 +43,10 @@ public static void changeSubjectToSubjects(final DublinCoreMetadataCollection co
     final MetadataField subject = collection.getOutputFields().get(DublinCore.PROPERTY_SUBJECT.getLocalName());
     collection.removeField(subject);
     final List<String> newValue;
-    if (subject.getValue() != null) {
+    if (subject.getValue() != null && subject.getValue() instanceof String) {
       newValue = Pattern.compile(",").splitAsStream(subject.getValue().toString()).collect(Collectors.toList());
+    } else if (subject.getValue() != null && subject.getValue() instanceof List) {
+      newValue = (List<String>)subject.getValue();
     } else {
       newValue = null;
     }
@@ -56,7 +58,7 @@ public static void changeSubjectToSubjects(final DublinCoreMetadataCollection co
             subject.isRequired(),
             newValue,
             subject.isTranslatable(),
-            MetadataField.Type.ITERABLE_TEXT,
+            MetadataField.Type.MIXED_TEXT,
             subject.getCollection(),
             subject.getCollectionID(),
             subject.getOrder(),

modules/external-api/src/test/resources/episode-catalog.properties

@@ -63,7 +63,7 @@ property.contributors.order=8
 # Subject
 property.subject.inputID=subject
 property.subject.label=EVENTS.EVENTS.DETAILS.METADATA.SUBJECT
-property.subject.type=text
+property.subject.type=mixed_text
 property.subject.readOnly=false
 property.subject.required=false
 property.subject.order=1

modules/external-api/src/test/resources/event-metadata-expected.json

@@ -15,7 +15,7 @@
         "readOnly": false,
         "id": "subjects",
         "label": "EVENTS.EVENTS.DETAILS.METADATA.SUBJECT",
-        "type": "text",
+        "type": "mixed_text",
         "value": [],
         "required": false
       },

modules/external-api/src/test/resources/event-metadata-update-expected.json

@@ -11,8 +11,8 @@
     "readOnly": false,
     "id": "subject",
     "label": "EVENTS.EVENTS.DETAILS.METADATA.SUBJECT",
-    "type": "text",
-    "value": "What this is about - edited",
+    "type": "mixed_text",
+    "value": ["What this is about - edited"],
     "required": false
   },
   {

modules/external-api/src/test/resources/event-update-expected.json

@@ -15,8 +15,8 @@
         "readOnly": false,
         "id": "subject",
         "label": "EVENTS.EVENTS.DETAILS.METADATA.SUBJECT",
-        "type": "text",
-        "value": "updated subject 1,updated subject 2",
+        "type": "mixed_text",
+        "value": ["updated subject 1","updated subject 2"],
         "required": false
       },
       {