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

[noreply at shibboleth.net]

Author: iay
Date: Tue Oct 22 11:29:35 2013
New Revision: 284

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=284&view=rev
Log:
MDA-113: review code with -Xlint:unchecked
Fixed all visible problems in the main code.  I have *not* done the same for the tests as yet (and probably never will) although I did take a look at a few.
One minor API change came out of this, where a parameter which was a "..." of a generic type has been changed to a List<Type>.  This is almost certainly not visible to users, unless they have developed alternate implementations of CollectionMergeStrategy (which seems unlikely).

Modified:
    trunk/aggregator-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/CollectionMergeStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/DeduplicatingItemIdMergeStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleCollectionMergeStrategy.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionFactory.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/AbstractItemMetadataSelectionStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineCallable.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/SplitMergeStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StatusMetadataLoggingStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemCollectionWithMetadata.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/util/ItemMetadataSupport.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/ElementFormattingStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/ContactPersonFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/ItemMetadataFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.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=284&r1=283&r2=284&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 Oct 22 11:29:35 2013
@@ -72,7 +72,7 @@
      * @param args command line arguments
      */
     public static void main(String[] args) {
-        SimpleCommandLineArguments cli = new SimpleCommandLineArguments();
+        final SimpleCommandLineArguments cli = new SimpleCommandLineArguments();
         cli.parseCommandLineArguments(args);
 
         if (cli.doHelp()) {
@@ -93,8 +93,13 @@
         }
 
         log.debug("Retrieving pipeline from Spring context");
-        String pipelineName = cli.getPipelineName();
-        Pipeline pipeline = appCtx.getBean(pipelineName, Pipeline.class);
+        final String pipelineName = cli.getPipelineName();
+        
+        // Warning suppressed: unavoidable, given type erasure
+        @SuppressWarnings("unchecked")
+        final Pipeline<DOMElementItem> pipeline =
+            (Pipeline<DOMElementItem>) appCtx.getBean(pipelineName, Pipeline.class);
+
         if (pipeline == null) {
             log.error("No net.shibboleth.metadata.pipeline.Pipeline, with ID {}, defined in Spring configuration",
                     pipelineName);
@@ -109,11 +114,11 @@
                 log.debug("Retrieved pipeline has already been initialized");
             }
 
-            ArrayList<DOMElementItem> item = new ArrayList<>();
-            Date startTime = new Date();
+            final ArrayList<DOMElementItem> itemCollection = new ArrayList<>();
+            final Date startTime = new Date();
             log.info("Pipeline '{}' execution starting at {}", pipelineName, startTime);
-            pipeline.execute(item);
-            Date endTime = new Date();
+            pipeline.execute(itemCollection);
+            final Date endTime = new Date();
             log.info("Pipeline '{}' execution completed at {}; run time {} seconds",

[... 779 lines stripped ...]