From 8080bff1b66175fe9125a537c760a45f2a458633 Mon Sep 17 00:00:00 2001
From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:13:50 -0600
Subject: [PATCH] DRYD-1451: Xlsx Report Configuration (#421)

---
 .../src/main/resources/accessions.xml         |   2 +-
 .../main/resources/artwork_description.xml    |   2 +-
 .../src/main/resources/borrowing_receipt.xml  |   2 +-
 .../src/main/resources/box_list.xml           |   2 +-
 .../src/main/resources/condition.xml          |   2 +-
 .../src/main/resources/deaccessions.xml       |   2 +-
 .../src/main/resources/deed_of_gift.jrxml     |  11 -
 .../src/main/resources/deed_of_gift.xml       |   2 +-
 .../src/main/resources/full_obj_place.xml     |   2 +-
 .../src/main/resources/incoming_loan.xml      |   2 +-
 .../main/resources/incoming_loan_letter.xml   |   2 +-
 .../resources/obj_computed_location.jrxml     |  11 -
 .../main/resources/obj_computed_location.xml  |   2 +-
 .../resources/obj_current_place_details.xml   |   2 +-
 .../src/main/resources/object_valuation.jrxml |  10 -
 .../src/main/resources/outgoing_loan.xml      |   2 +-
 .../main/resources/outgoing_loan_letter.xml   |   2 +-
 .../src/main/resources/referral.xml           |   2 +-
 .../main/resources/tombstone_with_budget.xml  |   2 +-
 .../main/resources/tombstone_with_creator.xml |   2 +-
 .../nuxeo/ReportDocumentModelHandler.java     | 354 ++++++++++--------
 21 files changed, 209 insertions(+), 211 deletions(-)

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/accessions.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/accessions.xml
index 1567d24b0..a0eb6d1c4 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/accessions.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/accessions.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>accessions.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/artwork_description.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/artwork_description.xml
index d82ab47d2..24cb3a99a 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/artwork_description.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/artwork_description.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>artwork_description.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/borrowing_receipt.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/borrowing_receipt.xml
index f418e09cd..9c9bb98b4 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/borrowing_receipt.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/borrowing_receipt.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>borrowing_receipt.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/box_list.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/box_list.xml
index b566c2c59..6d5da1a7a 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/box_list.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/box_list.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>box_list.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/condition.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/condition.xml
index bf7ba9b19..b0cf52b00 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/condition.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/condition.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>condition.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.xml
index 31b74882f..25e7dc6b0 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/deaccessions.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>deaccessions.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml
index f66853b6f..c99895c18 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.jrxml
@@ -4,19 +4,8 @@
 	xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd"
 	name="deedofgift" pageWidth="1500" pageHeight="800" orientation="Landscape" columnWidth="1460" leftMargin="20" rightMargin="20"
 	topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="202f91ff-d0dd-4eda-90de-a15938303d79">
-	<property name="net.sf.jasperreports.jrparameter.is.ignore.pagination" value="true" />
-	<property name="net.sf.jasperreports.export.xls.one.page.per.sheet" value="false" />
-	<property name="net.sf.jasperreports.export.xls.sheet.names.all" value="DeedOfGift-Report/Footnotes" />
-	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true" />
-	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true" />
-	<property name="net.sf.jasperreports.export.xls.white.page.background" value="false" />
-	<property name="net.sf.jasperreports.export.xls.detect.cell.type" value="true" />
-	<property name="net.sf.jasperreports.page.break.no.pagination" value="apply" />
-	<property name="net.sf.jasperreports.export.xls.freeze.row" value="2" />
-	<property name="net.sf.jasperreports.print.keep.full.text" value="true" />
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="pageHeader" />
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageFooter" />
-	<property name="net.sf.jasperreports.exports.xls.font.size.fix.enabled" value="false" />
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="nuxeo"/>
 	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="193"/>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.xml
index b47050a92..5ac742cbe 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/deed_of_gift.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>deed_of_gift.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.xml
index 67f88e4c2..e7d191330 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>full_obj_place.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan.xml
index b93065f76..32c0c4d87 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>incoming_loan.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan_letter.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan_letter.xml
index 29b0a9d4a..6f2873a92 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan_letter.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/incoming_loan_letter.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>incoming_loan_letter.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml
index 4e3bf4f37..d4011756e 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.jrxml
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Created with Jaspersoft Studio version 6.20.1.final using JasperReports Library version 6.20.1-7584acb244139816654f64e2fd57a00d3e31921e  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="objcomputedlocation" pageWidth="1000" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="0b89017b-1c64-4285-9d1a-33596b3f5bb3">
-	<property name="net.sf.jasperreports.jrparameter.is.ignore.pagination" value="true" />
-	<property name="net.sf.jasperreports.export.xls.one.page.per.sheet" value="false" />
-	<property name="net.sf.jasperreports.export.xls.sheet.names.all" value="BasicObjWithLocation-Report/Footnotes" />
-	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true" />
-	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true" />
-	<property name="net.sf.jasperreports.export.xls.white.page.background" value="false" />
-	<property name="net.sf.jasperreports.export.xls.detect.cell.type" value="true" />
-	<property name="net.sf.jasperreports.page.break.no.pagination" value="apply" />
-	<property name="net.sf.jasperreports.export.xls.freeze.row" value="2" />
-	<property name="net.sf.jasperreports.print.keep.full.text" value="true" />
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="pageHeader" />
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageFooter" />
-	<property name="net.sf.jasperreports.exports.xls.font.size.fix.enabled" value="false" />
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="nuxeo"/>
 	<property name="com.jaspersoft.studio.data.sql.SQLQueryDesigner.sash.w1" value="193"/>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.xml
index 62452fdb7..78c6fa7b7 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_computed_location.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>obj_computed_location.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_current_place_details.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_current_place_details.xml
index dc0e168a8..e8ac34f93 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_current_place_details.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/obj_current_place_details.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>obj_current_place_details.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/object_valuation.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/object_valuation.jrxml
index df2d25c2b..376f9865b 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/object_valuation.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/object_valuation.jrxml
@@ -2,18 +2,8 @@
 <!-- Created with Jaspersoft Studio version 6.10.0.final using JasperReports Library version 6.10.0-unknown  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="obj_val" pageWidth="1000" pageHeight="800" orientation="Landscape" columnWidth="100" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" isIgnorePagination="true" uuid="49b29b35-57c3-422f-8699-01975b0a33f9">
 	<property name="com.jaspersoft.studio.data.sql.tables" value=""/>
-	<property name="net.sf.jasperreports.jrparameter.is.ignore.pagination" value="true"/>
-	<property name="net.sf.jasperreports.export.xls.one.page.per.sheet" value="false"/>
-	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
-	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.columns" value="true"/>
-	<property name="net.sf.jasperreports.export.xls.white.page.background" value="false"/>
-	<property name="net.sf.jasperreports.export.xls.detect.cell.type" value="true"/>
-	<property name="net.sf.jasperreports.page.break.no.pagination" value="apply"/>
-	<property name="net.sf.jasperreports.export.xls.freeze.row" value="2"/>
-	<property name="net.sf.jasperreports.print.keep.full.text" value="true"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageFooter"/>
-	<property name="net.sf.jasperreports.exports.xls.font.size.fix.enabled" value="false"/>
 	<style name="Column header" fontName="SansSerif" fontSize="12" isBold="true"/>
 	<style name="Detail" fontName="SansSerif" fontSize="12"/>
 	<parameter name="csidlist" class="java.lang.String" isForPrompting="false"/>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.xml
index 09eac38ca..718e6fffc 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>outgoing_loan.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan_letter.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan_letter.xml
index 4c0d3a813..31b9d8b15 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan_letter.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/outgoing_loan_letter.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>outgoing_loan_letter.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/referral.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/referral.xml
index ad8bf05b0..0d28e80dd 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/referral.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/referral.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>referral.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.xml
index 9506a5192..e2a314230 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_budget.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>tombstone_with_budget.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.xml b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.xml
index 70ce27376..e7c80afb7 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.xml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/tombstone_with_creator.xml
@@ -11,6 +11,6 @@
     <supportsGroup>false</supportsGroup>
     <supportsNoContext>true</supportsNoContext>
     <filename>tombstone_with_creator.jrxml</filename>
-    <outputMIME>text/csv</outputMIME>
+    <outputMIME>application/vnd.openxmlformats-officedocument.spreadsheetml.sheet</outputMIME>
   </ns2:reports_common>
 </document>
diff --git a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
index cc9ae4646..b4fe5bc0e 100644
--- a/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
+++ b/services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java
@@ -40,23 +40,30 @@ import javax.naming.NamingException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import net.sf.jasperreports.engine.JRBreak;
 import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JRExporter;
-import net.sf.jasperreports.engine.JRExporterParameter;
 import net.sf.jasperreports.engine.JRParameter;
+import net.sf.jasperreports.engine.JRTextElement;
 import net.sf.jasperreports.engine.JasperCompileManager;
 import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.design.JasperDesign;
 import net.sf.jasperreports.engine.export.HtmlExporter;
 import net.sf.jasperreports.engine.export.JRCsvExporter;
-import net.sf.jasperreports.engine.export.JRCsvExporterParameter;
 import net.sf.jasperreports.engine.export.JRPdfExporter;
 import net.sf.jasperreports.engine.export.JRXmlExporter;
 import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
 import net.sf.jasperreports.engine.export.ooxml.JRPptxExporter;
 import net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter;
 import net.sf.jasperreports.engine.xml.JRXmlLoader;
+import net.sf.jasperreports.export.Exporter;
+import net.sf.jasperreports.export.SimpleCsvExporterConfiguration;
+import net.sf.jasperreports.export.SimpleExporterInput;
+import net.sf.jasperreports.export.SimpleHtmlExporterOutput;
+import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
+import net.sf.jasperreports.export.SimpleWriterExporterOutput;
+import net.sf.jasperreports.export.SimpleXlsxReportConfiguration;
+import net.sf.jasperreports.export.SimpleXmlExporterOutput;
 import org.collectionspace.authentication.AuthN;
 import org.collectionspace.services.ReportJAXBSchema;
 import org.collectionspace.services.account.AccountResource;
@@ -70,7 +77,6 @@ import org.collectionspace.services.client.PoxPayloadOut;
 import org.collectionspace.services.client.ReportClient;
 import org.collectionspace.services.common.CSWebApplicationException;
 import org.collectionspace.services.common.ServiceMain;
-import org.collectionspace.services.common.api.FileTools;
 import org.collectionspace.services.common.api.Tools;
 import org.collectionspace.services.common.authorization_mgt.ActionGroup;
 import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl;
@@ -97,7 +103,6 @@ import org.collectionspace.services.report.ReportsCommon.ForRoles;
 import org.collectionspace.services.report.ReportsOuputMimeList;
 import org.collectionspace.services.report.ResourceActionGroup;
 import org.collectionspace.services.report.ResourceActionGroupList;
-import org.jfree.util.Log;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.nuxeo.ecm.core.api.model.PropertyException;
 import org.slf4j.Logger;
@@ -200,7 +205,7 @@ public class ReportDocumentModelHandler extends NuxeoDocumentModelHandler<Report
 		boolean releaseRepoSession = false;
 
 		// Ensure the current user has permission to run this report
-		if (isAuthoritzed(reportsCommon) == false) {
+		if (!isAuthorized(reportsCommon)) {
 			String msg = String.format("Report Resource: The user '%s' is not authorized to run the report '%s' CSID='%s'",
 					AuthN.get().getUserId(), reportsCommon.getName(), csid);
 			throw new PermissionException(msg);
@@ -355,56 +360,47 @@ public class ReportDocumentModelHandler extends NuxeoDocumentModelHandler<Report
 
 	}
 
-    private InputStream buildReportResult(
-			String reportCSID,
-			HashMap<String, Object> params,
-			String reportFileName,
-			String outputMimeType,
-			StringBuffer outReportFileName
-		) throws Exception {
+	private InputStream buildReportResult(
+		String reportCSID,
+		HashMap<String, Object> params,
+		String reportFileName,
+		String outputMimeType,
+		StringBuffer outReportFileName) throws Exception {
 
-			Connection conn = null;
-			InputStream result = null;
+		try (Connection conn = getConnection()) {
+			String reportName = Tools.getFilenameBase(reportFileName);
+			File reportCompiledFile = ReportResource.getReportCompiledFile(reportName);
 
-    	try {
-				String reportName = Tools.getFilenameBase(reportFileName);
-				File reportCompiledFile = ReportResource.getReportCompiledFile(reportName);
+			if (!reportCompiledFile.exists()) {
+				// Need to compile the file.
 
-				if (!reportCompiledFile.exists()) {
-					// Need to compile the file.
+				File reportSourceFile = ReportResource.getReportSourceFile(reportName);
 
-					File reportSourceFile = ReportResource.getReportSourceFile(reportName);
+				if (!reportSourceFile.exists()) {
+					logger.error("Report for csid={} is missing source file: {}",
+								 reportCSID, reportSourceFile.getAbsolutePath());
 
-					if(!reportSourceFile.exists()) {
-						logger.error("Report for csid={} is missing source file: {}",
-								reportCSID, reportSourceFile.getAbsolutePath());
-
-						throw new RuntimeException("Report is missing source file");
-					}
+					throw new RuntimeException("Report is missing source file");
+				}
 
-					logger.info("Report for csid={} is not compiled. Compiling first, and saving to: {}",
+				logger.info("Report for csid={} is not compiled. Compiling first, and saving to: {}",
 							reportCSID, reportCompiledFile.getAbsolutePath());
 
-					JasperDesign design = JRXmlLoader.load(reportSourceFile.getAbsolutePath());
+				JasperDesign design = JRXmlLoader.load(reportSourceFile.getAbsolutePath());
 
-					design.setScriptletClass("org.collectionspace.services.report.jasperreports.CSpaceReportScriptlet");
+				design.setScriptletClass("org.collectionspace.services.report.jasperreports.CSpaceReportScriptlet");
 
-					JasperCompileManager.compileReportToFile(design, reportCompiledFile.getAbsolutePath());
-				}
-
-				conn = getConnection();
+				JasperCompileManager.compileReportToFile(design, reportCompiledFile.getAbsolutePath());
+			}
 
-				if (logger.isTraceEnabled()) {
-					logger.trace("ReportResource for csid=" + reportCSID
-							+ " output as " + outputMimeType + " using report file: " + reportCompiledFile.getAbsolutePath());
-				}
+			logger.trace("ReportResource for csid={} output as {} using report file: {}", reportCSID, outputMimeType,
+						 reportCompiledFile.getAbsolutePath());
 
 			FileInputStream fileStream = new FileInputStream(reportCompiledFile);
+			// Report will be to a temporary file.
+			File tempOutputFile = Files.createTempFile("report-", null).toFile();
+			FileOutputStream tempOutputStream = new FileOutputStream(tempOutputFile);
 
-			// export report to pdf and build a response with the bytes
-			//JasperExportManager.exportReportToPdf(jasperprint);
-
-			JRExporter exporter = null;
 			// Strip extension from report filename.
 			String outputFilename = reportFileName;
 			// Strip extension from report filename.
@@ -417,134 +413,168 @@ public class ReportDocumentModelHandler extends NuxeoDocumentModelHandler<Report
 			if (idx > 0) {
 				outputFilename = outputFilename.substring(idx + 1);
 			}
-			if (outputMimeType.equals(MediaType.APPLICATION_XML)) {
-				params.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE);
-				exporter = new JRXmlExporter();
-				outputFilename = outputFilename+".xml";
-			} else if(outputMimeType.equals(MediaType.TEXT_HTML)) {
-				exporter = new HtmlExporter();
-				outputFilename = outputFilename+".html";
-			} else if(outputMimeType.equals(ReportClient.PDF_MIME_TYPE)) {
-				exporter = new JRPdfExporter();
-				outputFilename = outputFilename+".pdf";
-			} else if(outputMimeType.equals(ReportClient.CSV_MIME_TYPE)) {
-				params.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE);
-				exporter = new JRCsvExporter();
-				exporter.setParameter(JRCsvExporterParameter.FIELD_DELIMITER, ",");
-				outputFilename = outputFilename+".csv";
-			} else if(outputMimeType.equals(ReportClient.TSV_MIME_TYPE)) {
-				params.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE);
-				exporter = new JRCsvExporter();
-				exporter.setParameter(JRCsvExporterParameter.FIELD_DELIMITER, "\t");
-				outputFilename = outputFilename+".csv";
-			} else if(outputMimeType.equals(ReportClient.MSWORD_MIME_TYPE)	// Understand msword as docx
-					|| outputMimeType.equals(ReportClient.OPEN_DOCX_MIME_TYPE)) {
-				exporter = new JRDocxExporter();
-				outputFilename = outputFilename+".docx";
-			} else if(outputMimeType.equals(ReportClient.MSEXCEL_MIME_TYPE)	// Understand msexcel as xlsx
-					|| outputMimeType.equals(ReportClient.OPEN_XLSX_MIME_TYPE)) {
-				exporter = new JRXlsxExporter();
-				outputFilename = outputFilename+".xlsx";
-			} else if(outputMimeType.equals(ReportClient.MSPPT_MIME_TYPE)	// Understand msppt as xlsx
-					|| outputMimeType.equals(ReportClient.OPEN_PPTX_MIME_TYPE)) {
-				exporter = new JRPptxExporter();
-				outputFilename = outputFilename+".pptx";
-			} else {
-				logger.error("Reporting: unsupported output MIME type - defaulting to PDF");
-				exporter = new JRPdfExporter();
-				outputFilename = outputFilename+"-default-to.pdf";
+
+			Exporter exporter;
+			switch (outputMimeType) {
+				case MediaType.APPLICATION_XML:
+					params.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE);
+					exporter = xmlExporter(tempOutputStream);
+					outputFilename = outputFilename + ".xml";
+					break;
+				case MediaType.TEXT_HTML:
+					exporter = htmlExporter(tempOutputStream);
+					outputFilename = outputFilename + ".html";
+					break;
+				case ReportClient.PDF_MIME_TYPE:
+					exporter = pdfExporter(tempOutputStream);
+					outputFilename = outputFilename + ".pdf";
+					break;
+				case ReportClient.CSV_MIME_TYPE:
+					params.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE);
+					exporter = csvExporter(tempOutputStream);
+					outputFilename = outputFilename + ".csv";
+					break;
+				case ReportClient.TSV_MIME_TYPE:
+					params.put(JRParameter.IS_IGNORE_PAGINATION, Boolean.TRUE);
+					exporter = tsvExporter(tempOutputStream);
+					outputFilename = outputFilename + ".csv";
+					break;
+				case ReportClient.MSWORD_MIME_TYPE:
+				case ReportClient.OPEN_DOCX_MIME_TYPE:
+					exporter = docxExporter(tempOutputStream);
+					outputFilename = outputFilename + ".docx";
+					break;
+				case ReportClient.MSEXCEL_MIME_TYPE:
+				case ReportClient.OPEN_XLSX_MIME_TYPE:
+					params.put(JRParameter.IS_IGNORE_PAGINATION, true);
+					params.put(JRBreak.PROPERTY_PAGE_BREAK_NO_PAGINATION, JRBreak.PAGE_BREAK_NO_PAGINATION_APPLY);
+					params.put(JRTextElement.PROPERTY_PRINT_KEEP_FULL_TEXT, true);
+					exporter = xlsxExporter(tempOutputStream, outputFilename);
+					outputFilename = outputFilename + ".xlsx";
+					break;
+				case ReportClient.MSPPT_MIME_TYPE:
+				case ReportClient.OPEN_PPTX_MIME_TYPE:
+					exporter = pptxExporter(tempOutputStream);
+					outputFilename = outputFilename + ".pptx";
+					break;
+				default:
+					logger.error("Reporting: unsupported output MIME type - defaulting to PDF");
+					exporter = pdfExporter(tempOutputStream);
+					outputFilename = outputFilename + "-default-to.pdf";
+					break;
 			}
-			outReportFileName.append(outputFilename); // Set the out going param to the report's final file name
-                        // FIXME: Logging temporarily set to INFO level for CSPACE-5766;
-                        // can change to TRACE or DEBUG level as warranted thereafter
-                        if (logger.isInfoEnabled()) {
-                            logger.info(FileTools.getJavaTmpDirInfo());
-                        }
-                        // fill the report
-			JasperPrint jasperPrint = JasperFillManager.fillReport(fileStream, params,conn);
 
-			// Report will be to a temporary file.
-			File tempOutputFile = Files.createTempFile("report-", null).toFile();
-			FileOutputStream tempOutputStream = new FileOutputStream(tempOutputFile);
-			exporter.setParameter(JRExporterParameter.JASPER_PRINT, jasperPrint);
-			exporter.setParameter(JRExporterParameter.OUTPUT_STREAM, tempOutputStream);
+			outReportFileName.append(outputFilename); // Set the outgoing param to the report's final file name
+
+			// fill the report
+			JasperPrint jasperPrint = JasperFillManager.fillReport(fileStream, params, conn);
+			exporter.setExporterInput(new SimpleExporterInput(jasperPrint));
 			exporter.exportReport();
 			tempOutputStream.close();
 
-			result = new FileInputStream(tempOutputFile);
-	       	return result;
-        } catch (SQLException sqle) {
-            // SQLExceptions can be chained. We have at least one exception, so
-            // set up a loop to make sure we let the user know about all of them
-            // if there happens to be more than one.
-            if (logger.isDebugEnabled()) {
-	            SQLException tempException = sqle;
-	            while (null != tempException) {
-	                	logger.debug("SQL Exception: " + sqle.getLocalizedMessage());
-
-	                // loop to the next exception
-	                tempException = tempException.getNextException();
-	            }
-            }
-            Response response = Response.status(
-                    Response.Status.INTERNAL_SERVER_ERROR).entity(
-                    		"Invoke failed (SQL problem) on Report csid=" + reportCSID).type("text/plain").build();
-            throw new CSWebApplicationException(sqle, response);
-        } catch (JRException jre) {
-            if (logger.isDebugEnabled()) {
-            	logger.debug("JR Exception: " + jre.getLocalizedMessage() + " Cause: "+jre.getCause());
-            }
-            Response response = Response.status(
-                    Response.Status.INTERNAL_SERVER_ERROR).entity(
-                    		"Invoke failed (Jasper problem) on Report csid=" + reportCSID).type("text/plain").build();
-            throw new CSWebApplicationException(jre, response);
-        } catch (FileNotFoundException fnfe) {
-            if (logger.isDebugEnabled()) {
-            	logger.debug("FileNotFoundException: " + fnfe.getLocalizedMessage());
-            }
-            Response response = Response.status(
-                    Response.Status.INTERNAL_SERVER_ERROR).entity(
-                    		"Invoke failed (SQL problem) on Report csid=" + reportCSID).type("text/plain").build();
-            throw new CSWebApplicationException(fnfe, response);
-		} finally {
-        	if (conn!=null) {
-        		try {
-        			conn.close();
-                } catch (SQLException sqle) {
-                    // SQLExceptions can be chained. We have at least one exception, so
-                    // set up a loop to make sure we let the user know about all of them
-                    // if there happens to be more than one.
-                    if (logger.isDebugEnabled()) {
-   	                	logger.debug("SQL Exception closing connection: "
-   	                			+ sqle.getLocalizedMessage());
-                    }
-                } catch (Exception e) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Exception closing connection", e);
-                    }
-                }
-        	}
-        }
-    }
+			return new FileInputStream(tempOutputFile);
+		} catch (SQLException sqle) {
+			logger.error("SQL Exception in report {}", reportCSID, sqle);
+			Response response = Response.serverError()
+				.entity("Invoke failed (SQL problem) on Report csid=" + reportCSID)
+				.type("text/plain").build();
+			throw new CSWebApplicationException(sqle, response);
+		} catch (JRException jre) {
+			logger.error("JasperReports Exception: {} Cause: {}", jre.getLocalizedMessage(), jre.getCause());
+			Response response = Response.serverError()
+				.entity("Invoke failed (Jasper problem) on Report csid=" + reportCSID)
+				.type("text/plain").build();
+			throw new CSWebApplicationException(jre, response);
+		} catch (FileNotFoundException fnfe) {
+			logger.error("FileNotFoundException: {}", fnfe.getLocalizedMessage());
+			Response response = Response.serverError()
+				.entity("Invoke failed (FileNotFound) on Report csid=" + reportCSID)
+				.type("text/plain").build();
+			throw new CSWebApplicationException(fnfe, response);
+		}
+	}
 
-    private Connection getConnection() throws NamingException, SQLException {
-    	Connection result = null;
+	private JRPptxExporter pptxExporter(FileOutputStream outputStream) {
+		JRPptxExporter exporter = new JRPptxExporter();
+		exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(outputStream));
+		return exporter;
+	}
 
-    	ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = this.getServiceContext();
-    	try {
-    		String repositoryName = ctx.getRepositoryName();
-	    	if (repositoryName != null && repositoryName.trim().isEmpty() == false) {
-                        String cspaceInstanceId = ServiceMain.getInstance().getCspaceInstanceId();
-                        String databaseName = JDBCTools.getDatabaseName(repositoryName, cspaceInstanceId);
-	    		result = JDBCTools.getConnection(JDBCTools.NUXEO_READER_DATASOURCE_NAME, databaseName);
-	    	}
+	private JRXlsxExporter xlsxExporter(FileOutputStream outputStream, String outputFilename) {
+		JRXlsxExporter exporter = new JRXlsxExporter();
+		SimpleXlsxReportConfiguration reportConfig = new SimpleXlsxReportConfiguration();
+		reportConfig.setCollapseRowSpan(true);
+		reportConfig.setDetectCellType(true);
+		reportConfig.setRemoveEmptySpaceBetweenRows(true);
+		reportConfig.setRemoveEmptySpaceBetweenColumns(true);
+		reportConfig.setOnePagePerSheet(false);
+		reportConfig.setFontSizeFixEnabled(false);
+		reportConfig.setWhitePageBackground(false);
+		reportConfig.setFreezeRow(2);
+		reportConfig.setSheetNames(new String[] {outputFilename});
+
+		exporter.setConfiguration(reportConfig);
+		exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(outputStream));
+		return exporter;
+	}
+
+	private JRDocxExporter docxExporter(FileOutputStream outputStream) {
+		JRDocxExporter exporter = new JRDocxExporter();
+		exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(outputStream));
+		return exporter;
+	}
+
+	private JRCsvExporter tsvExporter(FileOutputStream outputStream) {
+		JRCsvExporter exporter = new JRCsvExporter();
+		final SimpleCsvExporterConfiguration exportConfig = new SimpleCsvExporterConfiguration();
+		exportConfig.setFieldDelimiter("\t");
+		exporter.setConfiguration(exportConfig);
+		exporter.setExporterOutput(new SimpleWriterExporterOutput(outputStream));
+		return exporter;
+	}
+
+	private JRCsvExporter csvExporter(FileOutputStream outputStream) {
+		JRCsvExporter exporter = new JRCsvExporter();
+		exporter.setExporterOutput(new SimpleWriterExporterOutput(outputStream));
+		return exporter;
+	}
+
+	private JRPdfExporter pdfExporter(FileOutputStream outputStream) {
+		JRPdfExporter exporter = new JRPdfExporter();
+		exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(outputStream));
+		return exporter;
+	}
+
+	private HtmlExporter htmlExporter(FileOutputStream outputStream) {
+		HtmlExporter exporter = new HtmlExporter();
+		exporter.setExporterOutput(new SimpleHtmlExporterOutput(outputStream));
+		return exporter;
+	}
+
+	private JRXmlExporter xmlExporter(FileOutputStream outputStream) {
+		JRXmlExporter exporter = new JRXmlExporter();
+		exporter.setExporterOutput(new SimpleXmlExporterOutput(outputStream));
+		return exporter;
+	}
+
+	private Connection getConnection() throws NamingException, SQLException {
+		Connection result = null;
+
+		ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx = this.getServiceContext();
+		try {
+			String repositoryName = ctx.getRepositoryName();
+			if (repositoryName != null && repositoryName.trim().isEmpty() == false) {
+				String cspaceInstanceId = ServiceMain.getInstance().getCspaceInstanceId();
+				String databaseName = JDBCTools.getDatabaseName(repositoryName, cspaceInstanceId);
+				result = JDBCTools.getConnection(JDBCTools.NUXEO_READER_DATASOURCE_NAME, databaseName);
+			}
 		} catch (Exception e) {
-			Log.error(e);
+			logger.error("Error getting database connection", e);
 			throw new NamingException();
 		}
 
-    	return result;
-    }
+		return result;
+	}
 
 	/**
 	 * Check to see if the current user is authorized to run/invoke this report.  If the report
@@ -552,7 +582,7 @@ public class ReportDocumentModelHandler extends NuxeoDocumentModelHandler<Report
 	 * @param reportsCommon
 	 * @return
 	 */
-	protected boolean isAuthoritzedWithPermissions(ReportsCommon reportsCommon) {
+	protected boolean isAuthorizedWithPermissions(ReportsCommon reportsCommon) {
 		boolean result = true;
 
 		ResourceActionGroupList resourceActionGroupList = reportsCommon.getResourceActionGroupList();
@@ -618,13 +648,13 @@ public class ReportDocumentModelHandler extends NuxeoDocumentModelHandler<Report
 	 * @param reportsCommon
 	 * @return
 	 */
-	protected boolean isAuthoritzed(ReportsCommon reportsCommon) {
+	protected boolean isAuthorized(ReportsCommon reportsCommon) {
 		boolean result = true;
 
 		if (hasRequiredRoles(reportsCommon)) {
 			result = isAuthorizedWithRoles(reportsCommon);
 		} else if (hasRequiredPermissions(reportsCommon)) {
-			result = isAuthoritzedWithPermissions(reportsCommon);
+			result = isAuthorizedWithPermissions(reportsCommon);
 		}
 
 		return result;
-- 
2.47.3