[java-identity-provider COMMIT] in /trunk/idp-profile-api/src: main/java/net/shibboleth/idp/profile/AbstractProfileAc...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Apr  2 17:09:59 2013
New Revision: 4384

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4384&view=rev
Log:
Adjustments until we finalize where ProfileRequestContext really lives.

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/navigate/WebflowRequestContextProfileRequestContextLookup.java
    trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java?rev=4384&r1=4383&r2=4384&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java Tue Apr  2 17:09:59 2013
@@ -18,6 +18,7 @@
 package net.shibboleth.idp.profile;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -30,6 +31,8 @@
 import net.shibboleth.utilities.java.support.component.ComponentValidationException;
 import net.shibboleth.utilities.java.support.component.ValidatableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+
+import org.opensaml.messaging.profile.ProfileRequestContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -210,9 +213,9 @@
      * 
      * @throws ProfileException thrown if there is a problem executing the profile action
      */
-    protected Event doExecute(final HttpServletRequest httpRequest, final HttpServletResponse httpResponse,
-            final RequestContext springRequestContext,
-            final ProfileRequestContext<InboundMessageType, OutboundMessageType> profileRequestContext)
+    protected Event doExecute(@Nullable final HttpServletRequest httpRequest,
+            @Nullable final HttpServletResponse httpResponse, @Nonnull final RequestContext springRequestContext,
+            @Nonnull final ProfileRequestContext<InboundMessageType, OutboundMessageType> profileRequestContext)
             throws ProfileException {
         return doExecute(httpRequest, httpResponse, profileRequestContext);
     }
@@ -228,8 +231,9 @@
      * 
      * @throws ProfileException thrown if there is a problem executing the profile action
      */
-    protected Event doExecute(final HttpServletRequest httpRequest, final HttpServletResponse httpResponse,
-            final ProfileRequestContext<InboundMessageType, OutboundMessageType> profileRequestContext)
+    protected Event doExecute(@Nullable final HttpServletRequest httpRequest,
+            @Nullable final HttpServletResponse httpResponse,
+            @Nonnull final ProfileRequestContext<InboundMessageType, OutboundMessageType> profileRequestContext)
             throws ProfileException {
         throw new UnsupportedOperationException();
     }

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/navigate/WebflowRequestContextProfileRequestContextLookup.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/navigate/WebflowRequestContextProfileRequestContextLookup.java?rev=4384&r1=4383&r2=4384&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/navigate/WebflowRequestContextProfileRequestContextLookup.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/navigate/WebflowRequestContextProfileRequestContextLookup.java Tue Apr  2 17:09:59 2013
@@ -17,8 +17,7 @@
 
 package net.shibboleth.idp.profile.navigate;
 
-import net.shibboleth.idp.profile.ProfileRequestContext;
-
+import org.opensaml.messaging.profile.ProfileRequestContext;
 import org.springframework.webflow.execution.RequestContext;
 
 import com.google.common.base.Function;

Modified: trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java?rev=4384&r1=4383&r2=4384&view=diff
==============================================================================
--- trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java (original)
+++ trunk/idp-profile-api/src/test/java/net/shibboleth/idp/profile/AbstractProfileActionTest.java Tue Apr  2 17:09:59 2013
@@ -75,7 +75,8 @@
         Assert.assertEquals(action.getId(), "mock");
     }
 
-    @Test public void testActionExecution() throws Exception {

[... 6 lines stripped ...]