[java-metadata-aggregator COMMIT] in /trunk/aggregator-pipeline/src: main/java/net/shibboleth/metadata/dom/XMLSignatu...

[noreply at shibboleth.net]

Author: iay
Date: Tue Jan 14 09:21:20 2014
New Revision: 319

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=319&view=rev
Log:
Remove some more redundant type arguments.

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.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/test/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java?rev=319&r1=318&r2=319&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureValidator.java Tue Jan 14 09:21:20 2014
@@ -91,13 +91,13 @@
         verificationKey = key;
         
         if (blacklistDigests != null) {
-            blacklistedDigests = new HashSet<String>(blacklistDigests);
+            blacklistedDigests = new HashSet<>(blacklistDigests);
         } else {
             blacklistedDigests = Collections.emptySet();
         }
         
         if (blacklistSignatureMethods != null) {
-            blacklistedSignatureMethods = new HashSet<String>(blacklistSignatureMethods);
+            blacklistedSignatureMethods = new HashSet<>(blacklistSignatureMethods);
         } else {
             blacklistedSignatureMethods = Collections.emptySet();
         }

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java?rev=319&r1=318&r2=319&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineDemultiplexerStage.java Tue Jan 14 09:21:20 2014
@@ -71,7 +71,7 @@
     private boolean waitingForPipelines;
 
     /** Factory used to create the Item collection that is then given to the pipelines. */
-    private Supplier<Collection<Item<T>>> collectionFactory = new SimpleItemCollectionFactory<T>();
+    private Supplier<Collection<Item<T>>> collectionFactory = new SimpleItemCollectionFactory<>();
 
     /** The pipelines through which items are sent and the selection strategy used for that pipeline. */
     private List<Pair<Pipeline<T>, Predicate<Item<T>>>> pipelineAndStrategies = Collections.emptyList();
@@ -164,13 +164,12 @@
             return;
         }
 
-        final Builder<Pair<Pipeline<T>, Predicate<Item<T>>>> checkedPasses =
-                new Builder<Pair<Pipeline<T>, Predicate<Item<T>>>>();
+        final Builder<Pair<Pipeline<T>, Predicate<Item<T>>>> checkedPasses = new Builder<>();
         for (Pair<Pipeline<T>, Predicate<Item<T>>> pass : passes) {
             Constraint.isNotNull(pass.getFirst(), "Pipeline can not be null");
             Constraint.isNotNull(pass.getSecond(), "Predicate can not be null");
 
-            checkedPasses.add(new Pair<Pipeline<T>, Predicate<Item<T>>>(pass));
+            checkedPasses.add(new Pair<>(pass));
         }
 
         pipelineAndStrategies = checkedPasses.build();
@@ -195,7 +194,7 @@
                 }
             }
 
-            pipelineFutures.add(executorService.submit(new PipelineCallable<T>(pipeline, selectedItems)));
+            pipelineFutures.add(executorService.submit(new PipelineCallable<>(pipeline, selectedItems)));
         }
 
         if (isWaitingForPipelines()) {

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java?rev=319&r1=318&r2=319&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/PipelineMergeStage.java Tue Jan 14 09:21:20 2014
@@ -66,7 +66,7 @@
      * The factory used to create the item returned by this source. Default implementation is

[... 71 lines stripped ...]