Use mixed_text for series subject

Author: geichelberger

modules/admin-ui/src/main/java/org/opencastproject/adminui/endpoint/SeriesEndpoint.java

@@ -422,7 +422,7 @@ private DublinCoreMetadataCollection getSeriesMetadata(Series series) {
     MetadataField subject = metadata.getOutputFields().get(DublinCore.PROPERTY_SUBJECT.getLocalName());
     metadata.removeField(subject);
     MetadataField newSubject = new MetadataField(subject);
-    newSubject.setValue(series.getSubject());
+    newSubject.setValue(series.getSubjects());
     metadata.addField(newSubject);
 
     MetadataField description = metadata.getOutputFields().get(DublinCore.PROPERTY_DESCRIPTION.getLocalName());

modules/elasticsearch-index/src/main/java/org/opencastproject/elasticsearch/index/objects/series/Series.java

@@ -46,6 +46,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -66,8 +67,9 @@
  * Object wrapper for a series.
  */
 @XmlType(name = "series", namespace = IndexObject.INDEX_XML_NAMESPACE, propOrder = { "identifier", "title",
-        "description", "subject", "organization", "language", "creator", "license", "extendedMetadata", "accessPolicy",
-        "managedAcl", "createdDateTime", "organizers", "contributors", "publishers", "rightsHolder", "theme" })
+        "description", "subjects", "subject", "organization", "language", "creator", "license", "extendedMetadata",
+        "accessPolicy", "managedAcl", "createdDateTime", "organizers", "contributors", "publishers", "rightsHolder",
+        "theme" })
 @XmlRootElement(name = "series", namespace = IndexObject.INDEX_XML_NAMESPACE)
 @XmlAccessorType(XmlAccessType.NONE)
 public class Series implements IndexObject {
@@ -91,8 +93,8 @@ public class Series implements IndexObject {
   private String description = null;
 
   /** The subject */
-  @XmlElement(name = "subject")
-  private String subject = null;
+  @XmlElement(name = "subjects")
+  private List<String> subjects = new ArrayList<>();
 
   /** The organization for the series */
   @XmlElement(name = "organization")
@@ -251,20 +253,43 @@ public String getDescription() {
   /**
    * Sets the series subject.
    *
-   * @param subject
+   * @param subjects
    *          the subject
    */
-  public void setSubject(String subject) {
-    this.subject = subject;
+  public void setSubjects(List<String> subjects) {
+    this.subjects = subjects;
+  }
+
+  /**
+   * Returns the series subject.
+   *
+   * @return the subject
+   */
+  public List<String> getSubjects() {
+    return subjects;
   }
 
   /**
    * Returns the series subject.
    *
    * @return the subject
    */
-  public String getSubject() {
-    return subject;
+  @Deprecated
+  private String getSubject() {
+    return String.join(",", this.subjects);
+  }
+
+  /**
+   * Sets the series subject.
+   *
+   * @param subject the subject
+   */
+  @XmlElement(name = "subject")
+  @Deprecated
+  private void setSubject(String subject) {
+    if (this.subjects.isEmpty() && Objects.nonNull(subject)) {
+      this.subjects.addAll(List.of(subject.split(",")));
+    }
   }
 
   /**

modules/elasticsearch-index/src/main/java/org/opencastproject/elasticsearch/index/objects/series/SeriesIndexUtils.java

@@ -90,8 +90,8 @@ public static SearchMetadataCollection toSearchMetadata(Series series) {
     if (StringUtils.trimToNull(series.getDescription()) != null) {
       metadata.addField(SeriesIndexSchema.DESCRIPTION, series.getDescription(), true);
     }
-    if (StringUtils.trimToNull(series.getSubject()) != null) {
-      metadata.addField(SeriesIndexSchema.SUBJECT, series.getSubject(), true);
+    if (series.getSubjects() != null) {
+      metadata.addField(SeriesIndexSchema.SUBJECT, series.getSubjects().toArray(), true);
     }
     if (StringUtils.trimToNull(series.getLanguage()) != null) {
       metadata.addField(SeriesIndexSchema.LANGUAGE, series.getLanguage(), false);

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

@@ -62,7 +62,8 @@ public class SeriesTest {
   private String id = "10.0000-1";
   private String title = "Land and Vegetation: Key players on the Climate Scene";
   private String description = "This is the description for this series.";
-  private String subject = "This is the subject";
+  private List<String> subjects = new ArrayList<>();
+  private String subject1 = "This is the subject";
   private String organization = "Organization";
   private String language = "Klingon";
   private String creator = "Creator Name";
@@ -85,6 +86,9 @@ public class SeriesTest {
   @Before
   public void setUp() throws IOException, IllegalStateException, java.text.ParseException {
     createdDateTime = new Date(DateTimeSupport.fromUTC("2011-07-16T20:39:05Z"));
+    // Setup subject collection
+    subjects.add(subject1);
+    subjects.add("This is another subject");
     // Setup presenter collection
     organizers.add(organizer1);
     organizers.add(organizer2);
@@ -100,11 +104,13 @@ public void setUp() throws IOException, IllegalStateException, java.text.ParseEx
 
   @Test
   public void testToJson() throws ParseException {
+
+
     // Initialize series
     Series series = new Series(id, organization);
     series.setTitle(title);
     series.setDescription(description);
-    series.setSubject(subject);
+    series.setSubjects(subjects);
     series.setLanguage(language);
     series.setCreator(creator);
     series.setLicense(license);
@@ -123,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(subject, seriesJsonObject.get(SUBJECT_JSON_KEY));
+    assertEquals(subjects, seriesJsonObject.get(SUBJECT_JSON_KEY));
     assertEquals(organization, seriesJsonObject.get(ORGANIZATION_JSON_KEY));
     assertEquals(language, seriesJsonObject.get(LANGUAGE_JSON_KEY));
     assertEquals(creator, seriesJsonObject.get(CREATOR_JSON_KEY));

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

@@ -365,12 +365,6 @@ private Response queryResultToJson(SearchResult<Series> result, boolean includeA
 
     for (SearchResultItem<Series> item : result.getItems()) {
       final Series s = item.getSource();
-      JsonArray subjects;
-      if (s.getSubject() == null) {
-        subjects = new JsonArray();
-      } else {
-        subjects = splitSubjectIntoArray(s.getSubject());
-      }
 
       Date createdDate = s.getCreatedDateTime();
       JsonObject seriesJson = new JsonObject();
@@ -379,8 +373,8 @@ private Response queryResultToJson(SearchResult<Series> result, boolean includeA
       seriesJson.addProperty("title", s.getTitle());
       seriesJson.addProperty("creator", safeString(s.getCreator()));
       seriesJson.addProperty("created", createdDate != null ? toUTC(createdDate.getTime()) : "");
-      seriesJson.add("subjects", subjects);
 
+      seriesJson.add("subjects", collectionToJsonArray(s.getSubjects()));
       seriesJson.add("contributors", collectionToJsonArray(s.getContributors()));
       seriesJson.add("organizers", collectionToJsonArray(s.getOrganizers()));
       seriesJson.add("publishers", collectionToJsonArray(s.getPublishers()));
@@ -452,12 +446,6 @@ public Response getSeries(@HeaderParam("Accept") String acceptHeader, @PathParam
         securityService.getUser());
     if (optSeries.isPresent()) {
       final Series s = optSeries.get();
-      JsonArray subjects;
-      if (s.getSubject() == null) {
-        subjects = new JsonArray();
-      } else {
-        subjects = splitSubjectIntoArray(s.getSubject());
-      }
       Date createdDate = s.getCreatedDateTime();
 
       JsonObject responseContent = new JsonObject();
@@ -467,7 +455,7 @@ public Response getSeries(@HeaderParam("Accept") String acceptHeader, @PathParam
       responseContent.addProperty("title", s.getTitle());
       responseContent.addProperty("description", safeString(s.getDescription()));
       responseContent.addProperty("creator", safeString(s.getCreator()));
-      responseContent.add("subjects", subjects);
+      responseContent.add("subjects", collectionToJsonArray(s.getSubjects()));
       responseContent.addProperty("organization", s.getOrganization());
       responseContent.addProperty("created", createdDate != null ? toUTC(createdDate.getTime()) : "");
       responseContent.add("contributors", collectionToJsonArray(s.getContributors()));
@@ -604,7 +592,7 @@ private DublinCoreMetadataCollection getSeriesMetadata(Series series) {
     MetadataField subject = metadata.getOutputFields().get(DublinCore.PROPERTY_SUBJECT.getLocalName());
     metadata.removeField(subject);
     MetadataField newSubject = new MetadataField(subject);
-    newSubject.setValue(series.getSubject());
+    newSubject.setValue(series.getSubjects());
     metadata.addField(newSubject);
 
     MetadataField description = metadata.getOutputFields().get(DublinCore.PROPERTY_DESCRIPTION.getLocalName());

modules/external-api/src/test/java/org/opencastproject/external/endpoint/TestSeriesEndpoint.java

@@ -52,6 +52,7 @@
 import org.easymock.EasyMock;
 import org.junit.Ignore;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -105,7 +106,7 @@ public TestSeriesEndpoint() throws Exception {
     Series series1 = new Series("4fd0ef66-aea5-4b7a-a62a-a4ada0eafd6f", "opencast");
     series1.setTitle("Via API");
     series1.setDescription("A series created over the external API");
-    series1.setSubject("Topic");
+    series1.setSubjects(Collections.singletonList("Topic"));
     series1.setCreator("Gracie Walsh");
     series1.setCreatedDateTime(new Date(1429175556000L));
     series1.addContributor("Nu'man Farooq Morcos");

modules/series-service-impl/src/main/java/org/opencastproject/series/impl/SeriesServiceImpl.java

@@ -749,7 +749,7 @@ private Function<Optional<Series>, Optional<Series>> getMetadataUpdateFunction(S
       Series series = seriesOpt.orElse(new Series(seriesId, orgId, securityService.getUser().getName()));
       series.setTitle(dc.getFirst(DublinCoreCatalog.PROPERTY_TITLE));
       series.setDescription(dc.getFirst(DublinCore.PROPERTY_DESCRIPTION));
-      series.setSubject(dc.getFirst(DublinCore.PROPERTY_SUBJECT));
+      series.setSubjects(dc.get(DublinCore.PROPERTY_SUBJECT, DublinCore.LANGUAGE_ANY));
       series.setLanguage(dc.getFirst(DublinCoreCatalog.PROPERTY_LANGUAGE));
       series.setLicense(dc.getFirst(DublinCoreCatalog.PROPERTY_LICENSE));
       series.setRightsHolder(dc.getFirst(DublinCore.PROPERTY_RIGHTS_HOLDER));