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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Jan 24 21:50:35 2012
New Revision: 2931

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2931&view=rev
Log:
Get rid of unnecessary constructors on AbstractContext.
Base auto-creation of subcontexts on no-arg constructor.
Move TestContext to own class file to avoid weirdness with reflection and inner classes.
Fix a typo bug in BasicMessageMetadataSubcontext setter and refactor constructor.

Added:
    trunk/opensaml-messaging-api/src/test/java/org/opensaml/messaging/context/TestContext.java   (with props)
Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/AbstractContext.java
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageMetadataSubcontext.java
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/Context.java
    trunk/opensaml-messaging-api/src/test/java/org/opensaml/messaging/context/AbstractContextTest.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/AbstractContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/AbstractContext.java?rev=2931&r1=2930&r2=2931&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/AbstractContext.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/AbstractContext.java Tue Jan 24 21:50:35 2012
@@ -64,39 +64,6 @@
         setId(UUID.randomUUID().toString());
     }
     
-    /**
-     * Constructor.
-     * 
-     * @param contextId ID for this context, not null nor empty
-     */
-    public AbstractContext(final String contextId) {
-        this();
-        setId(contextId);
-    }
-    
-    /**
-     * Constructor. Adds this context as a child of the given parent.
-     * Generates a random context id.
-     * 
-     * @param newParent the owning parent context.
-     */
-    public AbstractContext(final Context newParent) {
-        this();
-        newParent.addSubcontext(this);
-    }
-    
-    /**
-     * Constructor.
-     * 
-     * @param contextId ID for this context, not null nor empty
-     * @param newParent the owning parent context.
-     */
-    public AbstractContext(final String contextId, final Context newParent) {
-        this();
-        setId(contextId);
-        newParent.addSubcontext(this);
-    }
-    
     /** {@inheritDoc} */
     public String getId() {
         return id;
@@ -265,8 +232,8 @@
     protected <T extends Context> T createSubcontext(Class<T> clazz) {
         Constructor<T> constructor;
         try {
-            constructor = clazz.getConstructor(new Class[] {Context.class});
-            return constructor.newInstance(new Object[] { this });
+            constructor = clazz.getConstructor();
+            return constructor.newInstance();
         } catch (SecurityException e) {
             log.error("Security error on creating subcontext", e);
             throw new MessageRuntimeException("Error creating subcontext", e);

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageMetadataSubcontext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageMetadataSubcontext.java?rev=2931&r1=2930&r2=2931&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageMetadataSubcontext.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageMetadataSubcontext.java Tue Jan 24 21:50:35 2012
@@ -19,7 +19,8 @@
 
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
-/** A {@link Context} intended to be used as a subcontext of a {@link MessageContext}  that carries some basic metadata about the message. */
+/** A {@link Context} intended to be used as a subcontext of a {@link MessageContext}  that carries 
+ * some basic metadata about the message. */
 public class BasicMessageMetadataSubcontext extends AbstractContext {
 
     /** The ID of the message. */
@@ -30,14 +31,15 @@
 
     /** The issuer of the message. */
     private String issuer;
-    
+
     /**
      * Constructor. Adds this context to the parent message context.
      * 
      * @param parent the parent message context
      */
     public BasicMessageMetadataSubcontext(MessageContext parent) {
-        super(parent);
+        super();
+        parent.addSubcontext(this);
     }
 
     /**
@@ -55,7 +57,7 @@
      * @param newMessageId ID of the message
      */
     public void setMessageId(String newMessageId) {
-        newMessageId = StringSupport.trimOrNull(newMessageId);
+        messageId = StringSupport.trimOrNull(newMessageId);
     }
 
     /**

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/Context.java

[... 114 lines stripped ...]