From ea20dac6018869b889e5c7114506f0cb6bfb6c5f Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 1 May 2015 17:08:49 -0700
Subject: [PATCH] CSPACE-6610: Return error message if no valid records found
 in import request. Suppress stack traces in returned errors (these will still
 be logged).

---
 .../org/collectionspace/services/imports/ImportsResource.java | 4 ++--
 .../collectionspace/services/imports/nuxeo/ImportCommand.java | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
index 296e4eb86..a67eff5c5 100644
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/ImportsResource.java
@@ -247,7 +247,7 @@ public class ImportsResource extends AbstractCollectionSpaceResourceImpl<PoxPayl
 					+ report + "</import>";
 		} catch (Exception e) {
 			result = "<?xml version=\"1.0\"?><import><msg>ERROR</msg><report>"
-					+ Tools.errorToString(e, true) + "</report></import>";
+					+ e.getMessage() + "</report></import>";
 		}
 		return result;
 	}
@@ -278,7 +278,7 @@ public class ImportsResource extends AbstractCollectionSpaceResourceImpl<PoxPayl
 					+ report + "</import>";
 		} catch (Exception e) {
 			result = "<?xml version=\"1.0\"?><import><msg>ERROR</msg><report>"
-					+ Tools.errorToString(e, true) + "</report></import>";
+					+ e.getMessage() + "</report></import>";
 		}
 		return result;
 	}
diff --git a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
index 7e6671041..1d758ee82 100644
--- a/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
+++ b/services/imports/service/src/main/java/org/collectionspace/services/imports/nuxeo/ImportCommand.java
@@ -77,6 +77,9 @@ public class ImportCommand {
             pipe.setWriter(writer);
             DocumentTranslationMap dtm = pipe.run();
             Map<DocumentRef, DocumentRef> documentRefs = dtm.getDocRefMap(); // FIXME: Should be checking for null here!
+            if (documentRefs != null && documentRefs.isEmpty()) {
+                throw new Exception("No valid records found in import payload. Check XML markup for not-well-formed errors, elements not matching import or document-specific schema, etc.");
+            }
             dump.append("<importedRecords>");
             for (Map.Entry<DocumentRef, DocumentRef> entry : documentRefs.entrySet()) {
                 keyDocRef = (DocumentRef) entry.getKey();
-- 
2.47.3