Release Candidate 9.0.0-RC.2

.gitignore

@@ -24,4 +24,5 @@ bin
 *.diff
 logged_schemas
 logs
-.mvn
+.mvn/*
+!.mvn/maven.config

.mvn/maven.config

@@ -0,0 +1 @@
+--strict-checksums

3rdparty/ant/build.xml

@@ -0,0 +1,23 @@
+<project name="ant-libs" default="prepare-ant" basedir=".">
+  <description>Collectionspace Services - Ant Libs</description>
+
+  <target name="prepare-ant-libs">
+    <exec executable="mvn" failonerror="true">
+      <arg value="dependency:copy-dependencies"/>
+    </exec>
+  </target>
+
+  <target name="test-classpath" depends="prepare-ant-libs">
+    <path id="javax.classpath">
+      <fileset dir="./target/dependency">
+        <include name="*.jar" />
+      </fileset>
+    </path>
+
+    <scriptdef name="testscript" language="javascript" manager="javax" classpathref="javax.classpath">
+      <![CDATA[self.log('script ran successfully')]]>
+    </scriptdef>
+
+    <testscript/>
+  </target>
+</project>

3rdparty/ant/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.3rdparty</artifactId>
+    <version>${revision}</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>org.collectionspace.services.3rdparty.ant-lib</artifactId>
+  <name>collectionspace.3rdparty.ant-lib</name>
+  <packaging>pom</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.openjdk.nashorn</groupId>
+      <artifactId>nashorn-core</artifactId>
+      <version>15.7</version>
+    </dependency>
+  </dependencies>
+</project>

3rdparty/nuxeo/nuxeo-platform-elasticsearch/src/main/java/org/collectionspace/services/nuxeo/elasticsearch/DefaultESDocumentWriter.java

@@ -12,37 +12,33 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.ws.rs.core.HttpHeaders;
-
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.IntNode;
-import org.codehaus.jackson.node.ObjectNode;
-import org.codehaus.jackson.node.TextNode;
 import org.collectionspace.services.common.api.RefNameUtils;
-import org.nuxeo.ecm.automation.jaxrs.io.documents.JsonESDocumentWriter;
 import org.nuxeo.ecm.core.api.CoreSession;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.DocumentModelList;
+import org.nuxeo.elasticsearch.io.JsonESDocumentWriter;
 
 public class DefaultESDocumentWriter extends JsonESDocumentWriter {
-	private static ObjectMapper objectMapper = new ObjectMapper();
+	private static final ObjectMapper objectMapper = new ObjectMapper();
 
 	@Override
-	public void writeDoc(JsonGenerator jg, DocumentModel doc, String[] schemas,
-			Map<String, String> contextParameters, HttpHeaders headers)
-			throws IOException {
-
+	public void writeESDocument(JsonGenerator jg, DocumentModel doc, String[] schemas,
+								Map<String, String> contextParameters) throws IOException {
 		ObjectNode denormValues = getDenormValues(doc);
 
 		jg.writeStartObject();
 
 		writeSystemProperties(jg, doc);
 		writeSchemas(jg, doc, schemas);
 		writeContextParameters(jg, doc, contextParameters);
-		writeDenormValues(jg, doc, denormValues);
+		writeDenormValues(jg, denormValues);
 
 		jg.writeEndObject();
 		jg.flush();
@@ -63,6 +59,7 @@ public ObjectNode getDenormValues(DocumentModel doc) {
 			denormConceptFields(doc, denormValues);
 			denormMaterialFields(doc, denormValues);
 			denormObjectNameFields(doc, denormValues);
+			denormMediaPriorityList(doc, session, tenantId, denormValues);
 
 			// Compute the title of the record for the public browser, and store it so that it can
 			// be used for sorting ES query results.
@@ -90,13 +87,13 @@ public ObjectNode getDenormValues(DocumentModel doc) {
 		return denormValues;
 	}
 
-	public void writeDenormValues(JsonGenerator jg, DocumentModel doc, ObjectNode denormValues) throws IOException {
-		if (denormValues != null && denormValues.size() > 0) {
+	public void writeDenormValues(JsonGenerator jg, ObjectNode denormValues) throws IOException {
+		if (denormValues != null && !denormValues.isEmpty()) {
 			if (jg.getCodec() == null) {
 				jg.setCodec(objectMapper);
 			}
 
-			Iterator<Map.Entry<String, JsonNode>> entries = denormValues.getFields();
+			Iterator<Map.Entry<String, JsonNode>> entries = denormValues.fields();
 
 			while (entries.hasNext()) {
 				Map.Entry<String, JsonNode> entry = entries.next();
@@ -112,29 +109,26 @@ private void denormMediaRecords(CoreSession session, String csid, String tenantI
 
 		String relatedRecordQuery = String.format("SELECT * FROM Relation WHERE relations_common:subjectCsid = '%s' AND relations_common:objectDocumentType = 'Media' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'", csid, tenantId);
 		DocumentModelList relationDocs = session.query(relatedRecordQuery);
-		List<JsonNode> mediaCsids = new ArrayList<JsonNode>();
-		List<JsonNode> mediaAltTexts = new ArrayList<JsonNode>();
+		List<JsonNode> mediaCsids = new ArrayList<>();
+		List<JsonNode> mediaAltTexts = new ArrayList<>();
 
 		if (relationDocs.size() > 0) {
-			Iterator<DocumentModel> iterator = relationDocs.iterator();
+            for (DocumentModel relationDoc : relationDocs) {
+                String mediaCsid = (String) relationDoc.getProperty("relations_common", "objectCsid");
+                DocumentModel mediaDoc = getRecordByCsid(session, tenantId, "Media", mediaCsid);
 
-			while (iterator.hasNext()) {
-				DocumentModel relationDoc = iterator.next();
-				String mediaCsid = (String) relationDoc.getProperty("relations_common", "objectCsid");
-				DocumentModel mediaDoc = getRecordByCsid(session, tenantId, "Media", mediaCsid);
+                if (isMediaPublished(mediaDoc)) {
+                    mediaCsids.add(new TextNode(mediaCsid));
 
-				if (isMediaPublished(mediaDoc)) {
-					mediaCsids.add(new TextNode(mediaCsid));
+                    String altText = (String) mediaDoc.getProperty("media_common", "altText");
 
-					String altText = (String) mediaDoc.getProperty("media_common", "altText");
+                    if (altText == null) {
+                        altText = "";
+                    }
 
-					if (altText == null) {
-						altText = "";
-					}
-
-					mediaAltTexts.add(new TextNode(altText));
-				}
-			}
+                    mediaAltTexts.add(new TextNode(altText));
+                }
+            }
 		}
 
 		denormValues.putArray("mediaCsid").addAll(mediaCsids);
@@ -149,19 +143,16 @@ private void denormRelatedObjects(CoreSession session, String csid, String tenan
 				"SELECT * FROM Relation WHERE relations_common:objectCsid = '%s' AND relations_common:subjectDocumentType = 'CollectionObject' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'",
 				csid, tenantId);
 		DocumentModelList relationDocs = session.query(relatedRecordQuery);
-		List<JsonNode> objectCsids = new ArrayList<JsonNode>();
+		List<JsonNode> objectCsids = new ArrayList<>();
 
 		if (relationDocs.size() > 0) {
-			Iterator<DocumentModel> iterator = relationDocs.iterator();
-
-			while (iterator.hasNext()) {
-				DocumentModel relationDoc = iterator.next();
-				String objectCsid = (String) relationDoc.getProperty("relations_common", "subjectCsid");
+            for (DocumentModel relationDoc : relationDocs) {
+                String objectCsid = (String) relationDoc.getProperty("relations_common", "subjectCsid");
 
-				if (objectCsid != null) {
-					objectCsids.add(new TextNode(objectCsid));
-				}
-			}
+                if (objectCsid != null) {
+                    objectCsids.add(new TextNode(objectCsid));
+                }
+            }
 		}
 
 		denormValues.putArray("objectCsid").addAll(objectCsids);
@@ -172,20 +163,17 @@ private void denormAcquisitionRecords(CoreSession session, String csid, String t
 
 		String relatedRecordQuery = String.format("SELECT * FROM Relation WHERE relations_common:subjectCsid = '%s' AND relations_common:objectDocumentType = 'Acquisition' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'", csid, tenantId);
 		DocumentModelList relationDocs = session.query(relatedRecordQuery);
-		List<JsonNode> creditLines = new ArrayList<JsonNode>();
+		List<JsonNode> creditLines = new ArrayList<>();
 
 		if (relationDocs.size() > 0) {
-			Iterator<DocumentModel> iterator = relationDocs.iterator();
-
-			while (iterator.hasNext()) {
-				DocumentModel relationDoc = iterator.next();
-				String acquisitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid");
-				String creditLine = getCreditLine(session, tenantId, acquisitionCsid);
-
-				if (creditLine != null && creditLine.length() > 0) {
-					creditLines.add(new TextNode(creditLine));
-				}
-			}
+            for (DocumentModel relationDoc : relationDocs) {
+                String acquisitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid");
+                String creditLine = getCreditLine(session, tenantId, acquisitionCsid);
+
+                if (creditLine != null && !creditLine.isEmpty()) {
+                    creditLines.add(new TextNode(creditLine));
+                }
+            }
 		}
 
 		denormValues.putArray("creditLine").addAll(creditLines);
@@ -196,35 +184,82 @@ private void denormExhibitionRecords(CoreSession session, String csid, String te
 
 	String relatedRecordQuery = String.format("SELECT * FROM Relation WHERE relations_common:subjectCsid = '%s' AND relations_common:objectDocumentType = 'Exhibition' AND ecm:currentLifeCycleState = 'project' AND collectionspace_core:tenantId = '%s'", csid, tenantId);
 	DocumentModelList relationDocs = session.query(relatedRecordQuery);
-	List<JsonNode> exhibitions = new ArrayList<JsonNode>();
+	List<JsonNode> exhibitions = new ArrayList<>();
 
 	if (relationDocs.size() > 0) {
-		Iterator<DocumentModel> iterator = relationDocs.iterator();
+        for (DocumentModel relationDoc : relationDocs) {
+            String exhibitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid");
+            DocumentModel exhibitionDoc = getRecordByCsid(session, tenantId, "Exhibition", exhibitionCsid);
 
-		while (iterator.hasNext()) {
-			DocumentModel relationDoc = iterator.next();
-			String exhibitionCsid = (String) relationDoc.getProperty("relations_common", "objectCsid");
-			DocumentModel exhibitionDoc = getRecordByCsid(session, tenantId, "Exhibition", exhibitionCsid);
+            if (exhibitionDoc != null && isExhibitionPublished(exhibitionDoc)) {
+                ObjectNode exhibitionNode = objectMapper.createObjectNode();
 
-			if (exhibitionDoc != null && isExhibitionPublished(exhibitionDoc)) {
-				ObjectNode exhibitionNode = objectMapper.createObjectNode();
+                String title = (String) exhibitionDoc.getProperty("exhibitions_common", "title");
+                String generalNote = (String) exhibitionDoc.getProperty("exhibitions_common", "generalNote");
+                String curatorialNote = (String) exhibitionDoc.getProperty("exhibitions_common", "curatorialNote");
 
-				String title = (String) exhibitionDoc.getProperty("exhibitions_common", "title");
-				String generalNote = (String) exhibitionDoc.getProperty("exhibitions_common", "generalNote");
-				String curatorialNote = (String) exhibitionDoc.getProperty("exhibitions_common", "curatorialNote");
+                exhibitionNode.put("title", title);
+                exhibitionNode.put("generalNote", generalNote);
+                exhibitionNode.put("curatorialNote", curatorialNote);
 
-				exhibitionNode.put("title", title);
-				exhibitionNode.put("generalNote", generalNote);
-				exhibitionNode.put("curatorialNote", curatorialNote);
-
-				exhibitions.add(exhibitionNode);
-			}
-		}
+                exhibitions.add(exhibitionNode);
+            }
+        }
 	}
 
 	denormValues.putArray("exhibition").addAll(exhibitions);
 }
 
+	/**
+	 * Denormalize the csid, blob csid, title, and alt text of each media record referenced by
+	 * the mediaPriorityList field of a collectionobject, so that the priority/sort
+	 * order set by the user can be displayed and searched.
+	 *
+	 * @param doc the collectionobject document
+	 * @param session the current session
+	 * @param tenantId the tenant id
+	 * @param denormValues the json node for denormalized fields
+	 */
+	private void denormMediaPriorityList(DocumentModel doc, CoreSession session, String tenantId, ObjectNode denormValues) {
+		List<String> mediaPriorityList = (List<String>) doc.getProperty("collectionobjects_common", "mediaPriorityList");
+		List<JsonNode> mediaPriorityNodes = new ArrayList<>();
+
+		if (mediaPriorityList != null) {
+			for (String mediaPriority : mediaPriorityList) {
+				if (StringUtils.isNotEmpty(mediaPriority)) {
+					String mediaCsid = null;
+
+					try {
+						mediaCsid = RefNameUtils.parseAuthorityInfo(mediaPriority).csid;
+					} catch (IllegalArgumentException e) {
+						// Not a parseable refName; nothing to denormalize for this entry.
+					}
+
+					if (mediaCsid != null) {
+						DocumentModel mediaDoc = getRecordByCsid(session, tenantId, "Media", mediaCsid);
+
+						if (mediaDoc != null && isMediaPublished(mediaDoc)) {
+							String blobCsid = (String) mediaDoc.getProperty("media_common", "blobCsid");
+							String title = (String) mediaDoc.getProperty("media_common", "title");
+							String altText = (String) mediaDoc.getProperty("media_common", "altText");
+
+							ObjectNode mediaPriorityNode = objectMapper.createObjectNode();
+
+							mediaPriorityNode.put("csid", mediaCsid);
+							mediaPriorityNode.put("blobCsid", blobCsid);
+							mediaPriorityNode.put("title", title);
+							mediaPriorityNode.put("altText", altText);
+
+							mediaPriorityNodes.add(mediaPriorityNode);
+						}
+					}
+				}
+			}
+		}
+
+		denormValues.putArray("mediaPriorityList").addAll(mediaPriorityNodes);
+	}
+
 	/**
 	 * Denormalize the material group list for a collectionobject in order to index the controlled or uncontrolled term
 	 *
@@ -376,15 +411,14 @@ private boolean isPublished(DocumentModel doc, String publishedFieldPart, String
 			List<String> publishToValues = (List<String>) doc.getProperty(publishedFieldPart, publishedFieldName);
 
 			if (publishToValues != null) {
-				for (int i=0; i<publishToValues.size(); i++) {
-					String value = publishToValues.get(i);
-					String shortId = RefNameUtils.getItemShortId(value);
-
-					if (shortId.equals("all") || shortId.equals("cspacepub")) {
-						isPublished = true;
-						break;
-					}
-				}
+                for (String value : publishToValues) {
+                    String shortId = RefNameUtils.getItemShortId(value);
+
+                    if (shortId.equals("all") || shortId.equals("cspacepub")) {
+                        isPublished = true;
+                        break;
+                    }
+                }
 			}
 		}
 
@@ -428,7 +462,7 @@ protected List<JsonNode> structDateToYearNodes(Map<String, Object> structDate) {
 	}
 
 	protected List<JsonNode> structDatesToYearNodes(List<Map<String, Object>> structDates) {
-		Set<Integer> years = new HashSet<Integer>();
+		Set<Integer> years = new HashSet<>();
 
 		for (Map<String, Object> structDate : structDates) {
 			if (structDate != null) {
@@ -440,8 +474,8 @@ protected List<JsonNode> structDatesToYearNodes(List<Map<String, Object>> struct
 					// Subtract one day to make it inclusive.
 					latestCalendar.add(Calendar.DATE, -1);
 
-					Integer earliestYear = earliestCalendar.get(Calendar.YEAR);
-					Integer latestYear = latestCalendar.get(Calendar.YEAR);;
+					int earliestYear = earliestCalendar.get(Calendar.YEAR);
+					int latestYear = latestCalendar.get(Calendar.YEAR);
 
 					for (int year = earliestYear; year <= latestYear; year++) {
 						years.add(year);
@@ -450,10 +484,10 @@ protected List<JsonNode> structDatesToYearNodes(List<Map<String, Object>> struct
 			}
 		}
 
-		List<Integer> yearList = new ArrayList<Integer>(years);
+		List<Integer> yearList = new ArrayList<>(years);
 		Collections.sort(yearList);
 
-		List<JsonNode> yearNodes = new ArrayList<JsonNode>();
+		List<JsonNode> yearNodes = new ArrayList<>();
 
 		for (Integer year : yearList) {
 			yearNodes.add(new IntNode(year));