You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2013/01/20 15:06:32 UTC
svn commit: r1435845 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/core/axis2/
core/src/main/java/org/apache/synapse/mediators/elementary/
core/src/main/java/org/apache/synapse/mediators/transform/
extensions/src/main/java/org...
Author: veithen
Date: Sun Jan 20 14:06:32 2013
New Revision: 1435845
URL: http://svn.apache.org/viewvc?rev=1435845&view=rev
Log:
Use the new SOAPEnvelope#getOrCreateHeader() method where appropriate.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?rev=1435845&r1=1435844&r2=1435845&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java Sun Jan 20 14:06:32 2013
@@ -19,9 +19,7 @@
package org.apache.synapse.core.axis2;
-import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.AddressingConstants;
@@ -383,11 +381,7 @@ public class Axis2FlexibleMEPClient {
}
}
// temporary workaround for https://issues.apache.org/jira/browse/WSCOMMONS-197
- if (axisOutMsgCtx.getEnvelope().getHeader() == null) {
- SOAPFactory fac = axisOutMsgCtx.isSOAP11() ?
- OMAbstractFactory.getSOAP11Factory() : OMAbstractFactory.getSOAP12Factory();
- fac.createSOAPHeader(axisOutMsgCtx.getEnvelope());
- }
+ axisOutMsgCtx.getEnvelope().getOrCreateHeader();
}
OperationClient mepClient = axisAnonymousOperation.createClient(serviceCtx, clientOptions);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java?rev=1435845&r1=1435844&r2=1435845&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java Sun Jan 20 14:06:32 2013
@@ -19,8 +19,6 @@
package org.apache.synapse.core.axis2;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -144,11 +142,8 @@ public class Axis2Sender {
}
// temporary workaround for https://issues.apache.org/jira/browse/WSCOMMONS-197
- if (messageContext.isEngaged(SynapseConstants.SECURITY_MODULE_NAME) &&
- messageContext.getEnvelope().getHeader() == null) {
- SOAPFactory fac = messageContext.isSOAP11() ?
- OMAbstractFactory.getSOAP11Factory() : OMAbstractFactory.getSOAP12Factory();
- fac.createSOAPHeader(messageContext.getEnvelope());
+ if (messageContext.isEngaged(SynapseConstants.SECURITY_MODULE_NAME)) {
+ messageContext.getEnvelope().getOrCreateHeader();
}
Axis2FlexibleMEPClient.clearSecurtityProperties(messageContext.getOptions());
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java?rev=1435845&r1=1435844&r2=1435845&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java Sun Jan 20 14:06:32 2013
@@ -20,9 +20,7 @@
package org.apache.synapse.mediators.elementary;
import org.apache.axiom.om.*;
-import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseLog;
import org.apache.synapse.util.MessageHelper;
@@ -123,20 +121,7 @@ public class Source {
if (node instanceof OMElement) {
if (node instanceof SOAPEnvelope) {
SOAPEnvelope soapEnvelope = (SOAPEnvelope) node;
- String soapNamespace = null;
-
- if (soapEnvelope.getNamespace() != null) {
- soapNamespace = soapEnvelope.getNamespace().getNamespaceURI();
- }
- if (soapEnvelope.getHeader() == null && soapNamespace != null) {
- SOAPFactory soapFactory;
- if (soapNamespace.equals(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
- soapFactory = OMAbstractFactory.getSOAP12Factory();
- } else {
- soapFactory = OMAbstractFactory.getSOAP11Factory();
- }
- soapFactory.createSOAPHeader(soapEnvelope);
- }
+ soapEnvelope.getOrCreateHeader();
sourceNodeList.add(soapEnvelope);
} else {
OMElement ele = (OMElement) node;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java?rev=1435845&r1=1435844&r2=1435845&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/HeaderMediator.java Sun Jan 20 14:06:32 2013
@@ -159,10 +159,7 @@ public class HeaderMediator extends Abst
return;
}
SOAPFactory fac = (SOAPFactory) env.getOMFactory();
- SOAPHeader header = env.getHeader();
- if (header == null) {
- header = fac.createSOAPHeader(env);
- }
+ SOAPHeader header = env.getOrCreateHeader();
SOAPHeaderBlock hb = header.addHeaderBlock(qName.getLocalPart(),
fac.createOMNamespace(qName.getNamespaceURI(), qName.getPrefix()));
hb.setText(value);
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java?rev=1435845&r1=1435844&r2=1435845&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java Sun Jan 20 14:06:32 2013
@@ -32,7 +32,6 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
@@ -106,12 +105,7 @@ public class ScriptMessageContext implem
* @throws ScriptException if an error occurs when converting the XML to OM
*/
public void addHeader(boolean mustUnderstand, Object content) throws ScriptException {
- SOAPEnvelope envelope = mc.getEnvelope();
- SOAPFactory factory = (SOAPFactory)envelope.getOMFactory();
- SOAPHeader header = envelope.getHeader();
- if (header == null) {
- header = factory.createSOAPHeader(envelope);
- }
+ SOAPHeader header = mc.getEnvelope().getOrCreateHeader();
OMElement element = xmlHelper.toOMElement(content);
// We can't add the element directly to the SOAPHeader. Instead, we need to copy the
// information over to a SOAPHeaderBlock.