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

[noreply at shibboleth.net]

Author: lajoie
Date: Mon May  7 12:34:18 2012
New Revision: 4186

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4186&view=rev
Log:
Minor code cleanup
Add some constraint annotations

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ActionSupport.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ProfileRequestContext.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyContext.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ActionSupport.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ActionSupport.java?rev=4186&r1=4185&r2=4186&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ActionSupport.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ActionSupport.java Mon May  7 12:34:18 2012
@@ -46,7 +46,19 @@
      * @return the proceed event
      */
     @Nonnull public static Event buildProceedEvent(@Nonnull final IdentifiableComponent source) {
-        return buildEvent(source, PROCEED_EVENT_ID, null);
+        return buildEvent(source, PROCEED_EVENT_ID);
+    }
+
+    /**
+     * Builds an event with a given ID but no related attributes.
+     * 
+     * @param source the source of the event
+     * @param eventId the ID of the event
+     * 
+     * @return the constructed event
+     */
+    @Nonnull public static Event buildEvent(@Nonnull final IdentifiableComponent source, @Nonnull final String eventId) {
+        return buildEvent(source, eventId, null);
     }
 
     /**

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ProfileRequestContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ProfileRequestContext.java?rev=4186&r1=4185&r2=4186&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ProfileRequestContext.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ProfileRequestContext.java Mon May  7 12:34:18 2012
@@ -17,6 +17,7 @@
 
 package net.shibboleth.idp.profile;
 
+import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -34,8 +35,7 @@
         InOutOperationContext<InboundMessageType, OutboundMessageType> {
 
     /** ID under which this context is stored, for example, within maps or sessions. */
-    public static final String BINDING_KEY = ProfileRequestContext.class.getPackage().getName()
-            + ProfileRequestContext.class.getName();
+    public static final String BINDING_KEY = ProfileRequestContext.class.getName();
 
     /**
      * Indicates whether the current profile request is passive. Passive requests are not capable of showing a UI to a
@@ -77,7 +77,7 @@
      * 
      * @return current HTTP request
      */
-    public HttpServletRequest getHttpRequest() {
+    @Nullable public HttpServletRequest getHttpRequest() {
         return httpRequest;
     }
 
@@ -86,7 +86,7 @@
      * 
      * @param request current HTTP request
      */
-    public void setHttpRequest(final HttpServletRequest request) {
+    public void setHttpRequest(@Nullable final HttpServletRequest request) {
         httpRequest = request;
     }
 
@@ -95,7 +95,7 @@
      * 
      * @return current HTTP response
      */
-    public HttpServletResponse getHttpResponse() {
+    @Nullable public HttpServletResponse getHttpResponse() {
         return httpResponse;
     }
 
@@ -104,7 +104,7 @@
      * 
      * @param response current HTTP response
      */
-    public void setHttpResponse(final HttpServletResponse response) {
+    public void setHttpResponse(@Nullable final HttpServletResponse response) {
         httpResponse = response;
     }
 }

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java?rev=4186&r1=4185&r2=4186&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java Mon May  7 12:34:18 2012
@@ -19,15 +19,22 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.idp.profile.ProfileRequestContext;

[... 173 lines stripped ...]