[java-metadata-aggregator COMMIT] in /trunk: aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLi...

[noreply at shibboleth.net]

Author: iay
Date: Tue Sep 17 12:32:21 2013
New Revision: 256

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=256&view=rev
Log:
MDA-66: should be possible to have CLI termination without a stack dump

Added:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/TerminationException.java   (with props)
Modified:
    trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java

Modified: trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java?rev=256&r1=255&r2=256&view=diff
==============================================================================
--- trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java (original)
+++ trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java Tue Sep 17 12:32:21 2013
@@ -23,6 +23,7 @@
 
 import net.shibboleth.metadata.dom.DomElementItem;
 import net.shibboleth.metadata.pipeline.Pipeline;
+import net.shibboleth.metadata.pipeline.TerminationException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -117,6 +118,15 @@
                     new Object[]{pipelineName, endTime, (endTime.getTime()-startTime.getTime())/1000f});
 
             System.exit(RC_OK);
+            
+        } catch (TerminationException e) {
+            if (cli.doVerboseOutput()) {
+                log.error("TerminationException during processing", e);
+            } else {
+                log.error("Terminated: {}", e.getMessage());
+            }
+            System.exit(RC_INIT);
+            
         } catch (Exception e) {
             log.error("Error processing information", e);
             System.exit(RC_INIT);

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java?rev=256&r1=255&r2=256&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStage.java Tue Sep 17 12:32:21 2013
@@ -44,13 +44,13 @@
     /** {@inheritDoc} */
     protected void doExecute(@Nonnull @NonnullElements final Collection<Item<?>> itemCollection, Item<?> matchingItem,
             Map<Class<? extends ItemMetadata>, List<? extends ItemMetadata>> matchingMetadata)
-            throws StageProcessingException {
+            throws TerminationException {
 
         final String itemId = getItemIdentifierStrategy().getItemIdentifier(matchingItem);
         log.error("Item {} caused processing to terminate because it was marked with a {}", itemId,
                 matchingMetadata.keySet());
 
-        throw new StageProcessingException("Item " + itemId + " marked with metadata of type "
+        throw new TerminationException("Item " + itemId + " marked with metadata of type "
                 + matchingMetadata.keySet());
     }
 }

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java?rev=256&r1=255&r2=256&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataTerminationStageTest.java Tue Sep 17 12:32:21 2013
@@ -84,7 +84,7 @@
             Assert.assertTrue(metadataCollection.contains(md2));
             Assert.assertTrue(metadataCollection.contains(md3));
             Assert.assertTrue(metadataCollection.contains(md4));
-        } catch (StageProcessingException e) {
+        } catch (TerminationException e) {
             Assert.fail("Stage failed unexpectedly");
         }
 
@@ -105,7 +105,7 @@
         try {
             stage.execute(metadataCollection);
             Assert.fail("Stage did not fail as expected");
-        } catch (StageProcessingException e) {
+        } catch (TerminationException e) {
             // expected this
         }
     }
@@ -127,7 +127,7 @@
         try {
             stage.execute(metadataCollection);
             Assert.fail("Stage did not fail as expected");
-        } catch (StageProcessingException e) {

[... 5 lines stripped ...]