[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:15:52 2014
New Revision: 3858

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3858&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/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfiguration.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicEncryptionConfigurationTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningConfigurationTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolverTest.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=3858&r1=3857&r2=3858&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:15:52 2014
@@ -81,6 +81,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NonnullElements @Unmodifiable @NotLive public List<Credential> getDataEncryptionCredentials() {
         return ImmutableList.copyOf(dataEncryptionCredentials);
     }
@@ -99,7 +100,8 @@
     }
     
     /** {@inheritDoc} */
-    @Nonnull @NonnullElements @Unmodifiable @NotLive public List<String> getDataEncryptionAlgorithmURIs() {
+    @Override
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public List<String> getDataEncryptionAlgorithms() {
         return ImmutableList.copyOf(dataEncryptionAlgorithms);
     }
     
@@ -117,6 +119,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NonnullElements @Unmodifiable @NotLive public List<Credential> getKeyTransportEncryptionCredentials() {
         return ImmutableList.copyOf(keyTransportEncryptionCredentials);
     }
@@ -135,7 +138,8 @@
     }
     
     /** {@inheritDoc} */
-    @Nonnull @NonnullElements @Unmodifiable @NotLive public List<String> getKeyTransportEncryptionAlgorithmURIs() {
+    @Override
+    @Nonnull @NonnullElements @Unmodifiable @NotLive public List<String> getKeyTransportEncryptionAlgorithms() {
         return ImmutableList.copyOf(keyTransportEncryptionAlgorithms);
     }
     
@@ -153,6 +157,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nullable public NamedKeyInfoGeneratorManager getDataKeyInfoGeneratorManager() {
         return dataKeyInfoGeneratorManager;
     }
@@ -167,6 +172,7 @@
     }
     
     /** {@inheritDoc} */
+    @Override
     @Nullable public NamedKeyInfoGeneratorManager getKeyTransportKeyInfoGeneratorManager() {
         return keyTransportKeyInfoGeneratorManager;
     }

Modified: trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java?rev=3858&r1=3857&r2=3858&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java (original)
+++ trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java Sun May 11 19:15:52 2014
@@ -118,8 +118,8 @@
     }
 
     /** {@inheritDoc} */
-    @Nonnull
-    public Iterable<EncryptionParameters> resolve(@Nonnull final CriteriaSet criteria) 
+    @Override
+    @Nonnull public Iterable<EncryptionParameters> resolve(@Nonnull final CriteriaSet criteria) 
             throws ResolverException {
         EncryptionParameters params = resolveSingle(criteria);
         if (params != null) {
@@ -130,8 +130,8 @@
     }
 
     /** {@inheritDoc} */
-    @Nullable
-    public EncryptionParameters resolveSingle(@Nonnull final CriteriaSet criteria) throws ResolverException {
+    @Override
+    @Nullable public EncryptionParameters resolveSingle(@Nonnull final CriteriaSet criteria) throws ResolverException {
         Constraint.isNotNull(criteria, "CriteriaSet was null");
         Constraint.isNotNull(criteria.get(EncryptionConfigurationCriterion.class), 
                 "Resolver requires an instance of EncryptionConfigurationCriterion");
@@ -411,7 +411,7 @@
         for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
                 .getConfigurations()) {
             
-            accumulator.addAll(Collections2.filter(config.getDataEncryptionAlgorithmURIs(), 

[... 288 lines stripped ...]