[java-opensaml COMMIT] in /trunk/opensaml-xmlsec-impl/src: main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigur...

[noreply at shibboleth.net]

Author: scantor
Date: Sun May 11 19:43:04 2014
New Revision: 3860

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3860&view=rev
Log:
Rename algorithm methods.

Modified:
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java?rev=3860&r1=3859&r2=3860&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionConfiguration.java Sun May 11 19:43:04 2014
@@ -110,7 +110,7 @@
      * 
      * @param algorithms the list of algorithms
      */
-    public void setDataEncryptionAlgorithmURIs(@Nullable final List<String> algorithms) {
+    public void setDataEncryptionAlgorithms(@Nullable final List<String> algorithms) {
         if (algorithms == null) {
             dataEncryptionAlgorithms = Collections.emptyList();
             return;
@@ -148,7 +148,7 @@
      * 
      * @param algorithms the list of algorithms
      */
-    public void setKeyTransportEncryptionAlgorithmURIs(@Nullable final List<String> algorithms) {
+    public void setKeyTransportEncryptionAlgorithms(@Nullable final List<String> algorithms) {
         if (algorithms == null) {
             keyTransportEncryptionAlgorithms = Collections.emptyList();
             return;

Modified: trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java?rev=3860&r1=3859&r2=3860&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java (original)
+++ trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java Sun May 11 19:43:04 2014
@@ -101,7 +101,7 @@
         Assert.assertNotNull(config.getDataEncryptionAlgorithms());
         Assert.assertEquals(config.getDataEncryptionAlgorithms().size(), 0);
         
-        config.setDataEncryptionAlgorithmURIs(Lists.newArrayList("   A   ", null, null, "   B    ", null, "   C    "));
+        config.setDataEncryptionAlgorithms(Lists.newArrayList("   A   ", null, null, "   B    ", null, "   C    "));
         
         Assert.assertNotNull(config.getDataEncryptionAlgorithms());
         Assert.assertEquals(config.getDataEncryptionAlgorithms().size(), 3);
@@ -109,7 +109,7 @@
         Assert.assertEquals(config.getDataEncryptionAlgorithms().get(1), "B");
         Assert.assertEquals(config.getDataEncryptionAlgorithms().get(2), "C");
         
-        config.setDataEncryptionAlgorithmURIs(null);
+        config.setDataEncryptionAlgorithms(null);
         
         Assert.assertNotNull(config.getDataEncryptionAlgorithms());
         Assert.assertEquals(config.getDataEncryptionAlgorithms().size(), 0);
@@ -117,7 +117,7 @@
     
     @Test(expectedExceptions=UnsupportedOperationException.class)
     public void testDataEncryptionAlgorithmURIsImmutable() {
-        config.setDataEncryptionAlgorithmURIs(Lists.newArrayList("A", "B", "C"));
+        config.setDataEncryptionAlgorithms(Lists.newArrayList("A", "B", "C"));
         config.getDataEncryptionAlgorithms().add("D");
     }
     
@@ -148,7 +148,7 @@
         Assert.assertNotNull(config.getKeyTransportEncryptionAlgorithms());
         Assert.assertEquals(config.getKeyTransportEncryptionAlgorithms().size(), 0);
         
-        config.setKeyTransportEncryptionAlgorithmURIs(Lists.newArrayList("   A    ", null, null, "   B   ", null, "   C   "));
+        config.setKeyTransportEncryptionAlgorithms(Lists.newArrayList("   A    ", null, null, "   B   ", null, "   C   "));
         
         Assert.assertNotNull(config.getKeyTransportEncryptionAlgorithms());
         Assert.assertEquals(config.getKeyTransportEncryptionAlgorithms().size(), 3);
@@ -156,7 +156,7 @@
         Assert.assertEquals(config.getKeyTransportEncryptionAlgorithms().get(1), "B");
         Assert.assertEquals(config.getKeyTransportEncryptionAlgorithms().get(2), "C");
         
-        config.setKeyTransportEncryptionAlgorithmURIs(null);
+        config.setKeyTransportEncryptionAlgorithms(null);
         
         Assert.assertNotNull(config.getKeyTransportEncryptionAlgorithms());
         Assert.assertEquals(config.getKeyTransportEncryptionAlgorithms().size(), 0);
@@ -164,7 +164,7 @@
     
     @Test(expectedExceptions=UnsupportedOperationException.class)

[... 7 lines stripped ...]