[java-metadata-aggregator] branch master updated: MDA-148 improve exception thrown on parse error in DOMResourceSourceStage

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-metadata-aggregator.

The following commit(s) were added to refs/heads/master by this push:
       new  a3fdc77   MDA-148 improve exception thrown on parse error in DOMResourceSourceStage
a3fdc77 is described below

commit a3fdc771cc2cb07c7b37a7d29237ac8041e70eb8
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Dec 3 17:24:51 2015 +0000

    MDA-148 improve exception thrown on parse error in DOMResourceSourceStage
---
 .../java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java  | 3 ++-
 .../java/net/shibboleth/metadata/dom/DOMResourceSourceTest.java   | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
index c5b0934..ce9cd10 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
@@ -166,7 +166,8 @@ public class DOMResourceSourceStage extends BaseStage<Element> {
             itemCollection.add(new DOMElementItem(parserPool.parse(data)));
         } catch (XMLParserException e) {
             if (errorCausesSourceFailure) {
-                throw new StageProcessingException("Unable to parse returned XML document", e);
+                throw new StageProcessingException(getId() + " unable to parse returned XML document " +
+                        domResource.getDescription(), e);
             } else {
                 log.warn("stage {}: unable to parse XML document", getId());
                 log.debug("stage {}: parsing exception", getId(), e);
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceTest.java
index 0ed81f6..6ed6585 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/DOMResourceSourceTest.java
@@ -64,7 +64,8 @@ public class DOMResourceSourceTest {
         Resource mdResource = new UrlResource("http://www.google.com/intl/en/images/about_logo.gif");
 
         DOMResourceSourceStage source = new DOMResourceSourceStage();
-        source.setId("test");
+        final String stageIdentifier = "testStage";
+        source.setId(stageIdentifier);
         source.setDOMResource(mdResource);
         source.setParserPool(parserPool);
         source.initialize();
@@ -75,6 +76,11 @@ public class DOMResourceSourceTest {
             throw new ConstraintViolationException("Invalid URL marked as parsed");
         } catch (StageProcessingException e) {
             // expected this
+            final String message = e.getMessage();
+            Assert.assertTrue(message.contains(stageIdentifier), "message should contain stage identifier");
+            Assert.assertNotNull(e.getCause(), "exception should have cause");
+            Assert.assertTrue(message.contains(mdResource.getDescription()),
+                    "message should contain resource description");
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.