[java-opensaml COMMIT] in /trunk: opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionOptionalC...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb  8 15:34:52 2017
New Revision: 4606

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4606&view=rev
Log:
Add @since annotations and some checkstyle fixes.

Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionOptionalCriterion.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionOptionalCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionOptionalCriterion.java?rev=4606&r1=4605&r2=4606&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionOptionalCriterion.java	(original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionOptionalCriterion.java	Wed Feb  8 15:34:52 2017
@@ -25,6 +25,8 @@
 
 /**
  * A criterion for specifying whether encryption is to be treated as optional.
+ * 
+ * @since 3.3.0
  */
 public class EncryptionOptionalCriterion implements Criterion {
     

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=4606&r1=4605&r2=4606&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	Wed Feb  8 15:34:52 2017
@@ -158,7 +158,7 @@
         }
         
         boolean encryptionOptional = false;
-        EncryptionOptionalCriterion encryptionOptionalCrit = criteria.get(EncryptionOptionalCriterion.class);
+        final EncryptionOptionalCriterion encryptionOptionalCrit = criteria.get(EncryptionOptionalCriterion.class);
         if (encryptionOptionalCrit != null) {
             encryptionOptional = encryptionOptionalCrit.isEncryptionOptional();
         }
@@ -231,12 +231,16 @@
         return validate(params, false);
     }
     
+// Checkstyle: CyclomaticComplexity OFF
     /**
      * Validate that the {@link EncryptionParameters} instance has all the required properties populated.
      * 
      * @param params the parameters instance to evaluate
+     * @param encryptionOptional whether to consider invalid parameters to be a problem
      * 
      * @return true if parameters instance passes validation, false otherwise
+     * 
+     * @since 3.3.0
      */
     protected boolean validate(@Nonnull final EncryptionParameters params, final boolean encryptionOptional) {
         if (params.getKeyTransportEncryptionCredential() == null 
@@ -284,7 +288,8 @@
         
         return true;
     }
-
+// Checkstyle: CyclomaticComplexity ON
+    
     /**
      * Get a predicate which implements the effective configured whitelist/blacklist policy.
      * 
@@ -395,7 +400,7 @@
      * @param whitelistBlacklistPredicate the whitelist/blacklist predicate with which to evaluate the 
      *          candidate data encryption and key transport algorithm URIs
      */
-    // Checkstyle: CyclomaticComplexity OFF -- more readable not split up
+// Checkstyle: CyclomaticComplexity|ReturnCount OFF -- more readable not split up
     protected void populateRSAOAEPParams(@Nonnull final RSAOAEPParameters rsaParams, 
             @Nonnull final CriteriaSet criteria,
             @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
@@ -406,10 +411,10 @@
         
         Predicate<String> algoSupportPredicate = getAlgorithmRuntimeSupportedPredicate();
         
-        for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
-                .getConfigurations()) {
-            
-            RSAOAEPParameters rsaConfig = config.getRSAOAEPParameters();
+        for (final EncryptionConfiguration config :
+                criteria.get(EncryptionConfigurationCriterion.class).getConfigurations()) {
+            
+            final RSAOAEPParameters rsaConfig = config.getRSAOAEPParameters();
             if (rsaConfig != null) {
                 if (rsaParams.getDigestMethod() == null) {
                     if (rsaConfig.getDigestMethod() != null 
@@ -436,7 +441,7 @@
             }
         }
     }
-    // Checkstyle:CyclomaticComplexity ON
+// Checkstyle:CyclomaticComplexity|ReturnCount ON
     
     /**
      * Resolve the optional effectively configured instance of {@link KeyTransportAlgorithmPredicate} to use.