[java-opensaml COMMIT] in /trunk: opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/MessageChannelS...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Feb 14 19:41:17 2014
New Revision: 3623

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3623&view=rev
Log:
Fix some doc warnings, remove some duplicate code.

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/MessageChannelSecurityContext.java
    trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java
    trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/HttpServletRequestMessageChannelSecurity.java
    trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/StaticMessageChannelSecurity.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/MessageChannelSecurityContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/MessageChannelSecurityContext.java?rev=3623&r1=3622&r2=3623&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/MessageChannelSecurityContext.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/MessageChannelSecurityContext.java Fri Feb 14 19:41:17 2014
@@ -46,7 +46,7 @@
     /**
      * Set whether message channel confidentiality is active.
      * 
-     * @param confidentialityActive The confidentialityActive to set.
+     * @param flag The confidentialityActive to set.
      */
     public void setConfidentialityActive(boolean flag) {
         confidentialityActive = flag;
@@ -64,7 +64,7 @@
     /**
      * Set whether message channel integrity is active.
      * 
-     * @param integrityActive The integrityActive to set.
+     * @param flag The integrityActive to set.
      */
     public void setIntegrityActive(boolean flag) {
         integrityActive = flag;

Modified: trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java?rev=3623&r1=3622&r2=3623&view=diff
==============================================================================
--- trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java (original)
+++ trunk/opensaml-profile-impl/src/main/java/org/opensaml/profile/action/impl/AbstractMessageChannelSecurity.java Fri Feb 14 19:41:17 2014
@@ -24,7 +24,6 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.BaseContext;
-import org.opensaml.messaging.context.MessageChannelSecurityContext;
 import org.opensaml.profile.ProfileException;
 import org.opensaml.profile.action.AbstractProfileAction;
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -32,17 +31,19 @@
 import com.google.common.base.Function;
 
 /**
- * Abstract base class for profile actions which populate a {@link MessageChannelSecurityContext} on a {@link BaseContext},
+ * Abstract base class for profile actions which populate a
+ * {@link org.opensaml.messaging.context.MessageChannelSecurityContext} on a {@link BaseContext},
  * where the latter is located using a lookup strategy.
  */
 public abstract class AbstractMessageChannelSecurity extends AbstractProfileAction {
     
     /**
-     * Strategy used to look up the parent {@link BaseContext} on which the {@link MessageChannelSecurityContext} 
-     * will be populated.
+     * Strategy used to look up the parent {@link BaseContext} on which the
+     * {@link org.opensaml.messaging.context.MessageChannelSecurityContext} will be populated.
      */
     @Nonnull private Function<ProfileRequestContext, BaseContext> parentContextLookupStrategy;
     
+    /** Parent for eventual context. */
     @Nullable private BaseContext parentContext;
     
     /** Constructor. */
@@ -56,11 +57,11 @@
     }
     
     /**
-     * Set the strategy used to look up the parent {@link BaseContext} on which the {@link MessageChannelSecurityContext}
-     * will be populated.
+     * Set the strategy used to look up the parent {@link BaseContext} on which the
+     * {@link org.opensaml.messaging.context.MessageChannelSecurityContext} will be populated.
      * 
      * @param strategy strategy used to look up the parent {@link BaseContext} on which to populate
-     *          the {@link MessageChannelSecurityContext}
+     *          the {@link org.opensaml.messaging.context.MessageChannelSecurityContext}
      */
     public void setParentContextLookupStrategy(
             @Nonnull final Function<ProfileRequestContext, BaseContext> strategy) {
@@ -74,7 +75,10 @@
     protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext) throws ProfileException {
 
         parentContext = parentContextLookupStrategy.apply(profileRequestContext);
-        return parentContext != null;

[... 116 lines stripped ...]