[java-opensaml COMMIT] in /trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic: MessageContextPredica...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct  4 08:58:49 2016
New Revision: 4508

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4508&view=rev
Log:
IDP-1047 Add ParameterName annotations found by review

https://issues.shibboleth.net/jira/browse/IDP-1047

Modified:
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/PredicateAccessControl.java
    trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java

Modified: trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java?rev=4508&r1=4507&r2=4508&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java	(original)
+++ trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/MessageContextPredicateAdapter.java	Tue Oct  4 08:58:49 2016
@@ -20,6 +20,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.MessageContext;
@@ -64,7 +65,8 @@
      *
      * @param prcPredicate the adapted predicate
      */
-    public MessageContextPredicateAdapter(@Nonnull final Predicate<ProfileRequestContext> prcPredicate) {
+    public MessageContextPredicateAdapter(
+                @Nonnull @ParameterName(name = "prcPredicate") final Predicate<ProfileRequestContext> prcPredicate) {
         this(prcPredicate, false);
     }
     
@@ -74,20 +76,22 @@
      * @param prcPredicate the adapted predicate
      * @param unresolvedSatisfies whether failure to resolve a parent ProfileRequestContext satisfies the predicate
      */
-    public MessageContextPredicateAdapter(@Nonnull final Predicate<ProfileRequestContext> prcPredicate,
-            boolean unresolvedSatisfies) {
+    public MessageContextPredicateAdapter(
+                @Nonnull @ParameterName(name = "prcPredicate") final Predicate<ProfileRequestContext> prcPredicate,
+                @ParameterName(name = "unresolvedSatisfies") final boolean unresolvedSatisfies) {
         adapted = Constraint.isNotNull(prcPredicate, "The adapted predicate may not be null");
         noPRCSatisfies = unresolvedSatisfies;
         prcLookup = new RecursiveTypedParentContextLookup<>(ProfileRequestContext.class);
     }
 
     /** {@inheritDoc} */
-    public boolean apply(@Nullable MessageContext input) {
+    @Override
+    public boolean apply(@Nullable final MessageContext input) {
         if (input == null) {
             return false;
         }
         
-        ProfileRequestContext prc = prcLookup.apply(input);
+        final ProfileRequestContext prc = prcLookup.apply(input);
         if (prc == null) {
             return noPRCSatisfies;
         }

Modified: trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/PredicateAccessControl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/PredicateAccessControl.java?rev=4508&r1=4507&r2=4508&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/PredicateAccessControl.java	(original)
+++ trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/PredicateAccessControl.java	Tue Oct  4 08:58:49 2016
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 import javax.servlet.ServletRequest;
 
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.security.AccessControl;
@@ -51,7 +52,8 @@
      *
      * @param condition the predicate to use
      */
-    public PredicateAccessControl(@Nonnull final Predicate<ProfileRequestContext> condition) {
+    public PredicateAccessControl(@Nonnull @ParameterName(name="condition")
+                                   final Predicate<ProfileRequestContext> condition) {
         predicate = Constraint.isNotNull(condition, "Predicate cannot be null");
     }
     

Modified: trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java?rev=4508&r1=4507&r2=4508&view=diff
==============================================================================
--- trunk/opensaml-profile-api/src/main/java/org/opensaml/profile/logic/ProfileIdPredicate.java	(original)

[... 19 lines stripped ...]