[java-metadata-aggregator] branch master updated: MDA-195 - fix types for Java 9 compatibility

[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.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=16250af9bdb46c9fd27f92616a08a8ef62e50152

The following commit(s) were added to refs/heads/master by this push:
       new  16250af   MDA-195 - fix types for Java 9 compatibility
16250af is described below

commit 16250af9bdb46c9fd27f92616a08a8ef62e50152
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Oct 5 12:09:04 2017 +0100

    MDA-195 - fix types for Java 9 compatibility
---
 .../net/shibboleth/metadata/dom/XMLSignatureSigningStage.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
index 03702f9..ca3c3b9 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
@@ -32,6 +32,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.security.auth.x500.X500Principal;
+import javax.xml.crypto.XMLStructure;
 import javax.xml.crypto.dsig.CanonicalizationMethod;
 import javax.xml.crypto.dsig.DigestMethod;
 import javax.xml.crypto.dsig.Reference;
@@ -814,7 +815,7 @@ public class XMLSignatureSigningStage extends AbstractIteratingStage<Element> {
      * @throws StageProcessingException thrown if there is a problem creating the KeyInfo descriptor
      */
     @Nonnull protected KeyInfo buildKeyInfo() throws StageProcessingException {
-        final ArrayList<Object> keyInfoItems = new ArrayList<>();
+        final List<XMLStructure> keyInfoItems = new ArrayList<>();
 
         addKeyNames(keyInfoItems);
         addKeyValue(keyInfoItems);
@@ -833,7 +834,7 @@ public class XMLSignatureSigningStage extends AbstractIteratingStage<Element> {
      * 
      * @throws StageProcessingException thrown if there is a problem creating the KeyName content
      */
-    protected void addKeyNames(@Nonnull @NonnullElements @Live final ArrayList<Object> keyInfoItems)
+    protected void addKeyNames(@Nonnull @NonnullElements @Live final List<XMLStructure> keyInfoItems)
             throws StageProcessingException {
         if (!includeKeyNames) {
             return;
@@ -853,7 +854,7 @@ public class XMLSignatureSigningStage extends AbstractIteratingStage<Element> {
      * 
      * @throws StageProcessingException thrown if there is a problem creating the KeyValue content
      */
-    protected void addKeyValue(@Nonnull @NonnullElements @Live final ArrayList<Object> keyInfoItems)
+    protected void addKeyValue(@Nonnull @NonnullElements @Live final List<XMLStructure> keyInfoItems)
             throws StageProcessingException {
         if (!includeKeyValue) {
             return;
@@ -883,7 +884,7 @@ public class XMLSignatureSigningStage extends AbstractIteratingStage<Element> {
      * 
      * @throws StageProcessingException thrown if there is a problem creating the X509Data content
      */
-    protected void addX509Data(@Nonnull @NonnullElements @Live final ArrayList<Object> keyInfoItems) {
+    protected void addX509Data(@Nonnull @NonnullElements @Live final List<XMLStructure> keyInfoItems) {
         final List<Object> x509Data = new ArrayList<>();
 
         if (certificates != null && !certificates.isEmpty()) {

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