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

[noreply at shibboleth.net]

Author: iay
Date: Sat Dec 13 14:01:41 2014
New Revision: 391

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=391&view=rev
Log:
Per IDP-536, don't use Guava Lists.newArrayList.

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRegistrationAuthorityFilterStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStageTest.java

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java?rev=391&r1=390&r2=391&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/XMLSignatureSigningStage.java Sat Dec 13 14:01:41 2014
@@ -24,6 +24,7 @@
 import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -242,10 +243,7 @@
         crls = Collections.emptyList();
         c14nExclusive = true;
         inclusivePrefixList = Collections.emptyList();
-        idAttributeNames = new ArrayList<>();
-        idAttributeNames.add(new QName("ID"));
-        idAttributeNames.add(new QName("id"));
-        idAttributeNames.add(new QName("Id"));
+        idAttributeNames = Arrays.asList(new QName[]{new QName("ID"), new QName("id"), new QName("Id")});
         keyNames = Collections.emptyList();
         includeKeyNames = true;
         includeX509Certificates = true;

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java?rev=391&r1=390&r2=391&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/EntityFilterStageTest.java Sat Dec 13 14:01:41 2014
@@ -18,7 +18,9 @@
 package net.shibboleth.metadata.dom.saml;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import net.shibboleth.metadata.Item;
@@ -30,8 +32,6 @@
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
-import com.google.common.collect.Lists;
-
 /** Unit test for {@link EntityFilterStage}. */
 public class EntityFilterStageTest extends BaseDOMTest {
 
@@ -42,9 +42,9 @@
 
     /** Test whitelisted entity is retained and ensure everything else is removed. */
     @Test public void testEntityWhitelist() throws Exception {
-        EntityFilterStage stage = new EntityFilterStage();
+        final EntityFilterStage stage = new EntityFilterStage();
         stage.setId("test");
-        stage.setDesignatedEntities(Lists.newArrayList("https://idp.shibboleth.net/idp/shibboleth"));
+        stage.setDesignatedEntities(Collections.singletonList("https://idp.shibboleth.net/idp/shibboleth"));
         stage.setWhitelistingEntities(true);
         stage.initialize();
 
@@ -56,9 +56,9 @@
 
     /** Test blacklisted entity is remove and ensure everything else is retained. */
     @Test public void testEntityBlacklist() throws Exception {
-        EntityFilterStage stage = new EntityFilterStage();
+        final EntityFilterStage stage = new EntityFilterStage();
         stage.setId("test");
-        stage.setDesignatedEntities(Lists.newArrayList("https://idp.shibboleth.net/idp/shibboleth"));
+        stage.setDesignatedEntities(Collections.singletonList("https://idp.shibboleth.net/idp/shibboleth"));
         stage.setWhitelistingEntities(false);
         stage.initialize();
 
@@ -73,9 +73,9 @@
         final ArrayList<Item<Element>> metadataCollection = new ArrayList<>();
         metadataCollection.add(new DOMElementItem(readXMLData("in.xml")));
 
-        EntityFilterStage stage = new EntityFilterStage();
+        final EntityFilterStage stage = new EntityFilterStage();
         stage.setId("test");
-        stage.setDesignatedEntities(Lists.newArrayList("https://idp.shibboleth.net/idp/shibboleth"));
+        stage.setDesignatedEntities(Collections.singletonList("https://idp.shibboleth.net/idp/shibboleth"));
         stage.setWhitelistingEntities(false);
         stage.initialize();
         stage.execute(metadataCollection);
@@ -91,10 +91,10 @@

[... 190 lines stripped ...]