[java-opensaml COMMIT] in /trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl: AddA...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jun 10 18:41:01 2015
New Revision: 4296

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4296&view=rev
Log:
Don't store off builders.  Since handlers are now prototypes, there's no efficiency gain.

Modified:
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java

Modified: trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java?rev=4296&r1=4295&r2=4296&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java	(original)
+++ trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddActionHandler.java	Wed Jun 10 18:41:01 2015
@@ -29,7 +29,6 @@
 import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.soap.messaging.SOAPMessagingSupport;
 import org.opensaml.soap.wsaddressing.Action;
-import org.opensaml.soap.wsaddressing.WSAddressingObjectBuilder;
 import org.opensaml.soap.wsaddressing.messaging.context.WSAddressingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,17 +47,8 @@
     /** Logger. */
     private Logger log = LoggerFactory.getLogger(AddActionHandler.class);
     
-    /** Builder of Action object. */
-    private WSAddressingObjectBuilder<Action> actionBuilder;
-    
     /** The Action URI value. */
     private String actionURI;
-    
-    /** Constructor. */
-    @SuppressWarnings("unchecked")
-    public AddActionHandler() {
-        actionBuilder = (WSAddressingObjectBuilder<Action>) XMLObjectSupport.getBuilder(Action.ELEMENT_NAME);
-    }
     
     /**
      * Get the Action URI.
@@ -97,7 +87,8 @@
 
     /** {@inheritDoc} */
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
-        Action action = actionBuilder.buildObject();
+        log.debug("Issuing WS-Addressing Action header with URI value: {}", getActionURI());
+        Action action = (Action) XMLObjectSupport.buildXMLObject(Action.ELEMENT_NAME);
         action.setValue(getActionURI());
         SOAPMessagingSupport.addHeaderBlock(messageContext, action);
     }

Modified: trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java?rev=4296&r1=4295&r2=4296&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java	(original)
+++ trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/AddMessageIDHandler.java	Wed Jun 10 18:41:01 2015
@@ -31,7 +31,6 @@
 import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.soap.messaging.SOAPMessagingSupport;
 import org.opensaml.soap.wsaddressing.MessageID;
-import org.opensaml.soap.wsaddressing.WSAddressingObjectBuilder;
 import org.opensaml.soap.wsaddressing.messaging.context.WSAddressingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,17 +50,8 @@
     /** Logger. */
     private Logger log = LoggerFactory.getLogger(AddMessageIDHandler.class);
     
-    /** Builder of Action object. */
-    private WSAddressingObjectBuilder<MessageID> messageIDBuilder;
-    
     /** Strategy for generating identifiers. */
     private IdentifierGenerationStrategy identifierGenerationStrategy;
-    
-    /** Constructor. */
-    @SuppressWarnings("unchecked")
-    public AddMessageIDHandler() {
-        messageIDBuilder = (WSAddressingObjectBuilder<MessageID>) XMLObjectSupport.getBuilder(MessageID.ELEMENT_NAME);
-    }
     
     /**
      * Get the identifier generation strategy.
@@ -87,7 +77,7 @@
     protected void doInvoke(@Nonnull final MessageContext messageContext) throws MessageHandlerException {
         String id = getMessageID(messageContext);
         log.debug("Issuing WS-Addressing MessageID: {}", id);
-        MessageID messageID = messageIDBuilder.buildObject();
+        MessageID messageID = (MessageID) XMLObjectSupport.buildXMLObject(MessageID.ELEMENT_NAME);
         messageID.setValue(id);
         SOAPMessagingSupport.addHeaderBlock(messageContext, messageID);
     }