You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by su...@apache.org on 2010/12/18 03:32:39 UTC
svn commit: r1050572 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath:
SynapseXPathFunctionContext.java SynapseXPathVariableContext.java
ext/XpathExtensionUtil.java
Author: supun
Date: Sat Dec 18 02:32:39 2010
New Revision: 1050572
URL: http://svn.apache.org/viewvc?rev=1050572&view=rev
Log:
minor re-factoring
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/ext/XpathExtensionUtil.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java?rev=1050572&r1=1050571&r2=1050572&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathFunctionContext.java Sat Dec 18 02:32:39 2010
@@ -84,9 +84,9 @@ public class SynapseXPathFunctionContext
return new Base64EncodeFunction();
}
//We check if custom Xpath extensions are available
- Function extensionFunction = XpathExtensionUtil.getFunctionContext(synCtx,namespaceURI,prefix,
- localName);
- if(extensionFunction!=null) {
+ Function extensionFunction = XpathExtensionUtil.getFunctionContext(
+ synCtx,namespaceURI,prefix, localName);
+ if (extensionFunction != null) {
return extensionFunction;
}
// if not the get-property function then try to get it from the parent context
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java?rev=1050572&r1=1050571&r2=1050572&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPathVariableContext.java Sat Dec 18 02:32:39 2010
@@ -201,8 +201,9 @@ public class SynapseXPathVariableContext
}
}
//try resolving using available custom extensions
- Object obj = XpathExtensionUtil.resolveVariableContext(synCtx,namespaceURI,prefix,localName);
- if(obj!=null) {
+ Object obj = XpathExtensionUtil.resolveVariableContext(
+ synCtx,namespaceURI,prefix,localName);
+ if (obj != null) {
return obj;
}
return parent.getVariableValue(namespaceURI, prefix, localName);
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/ext/XpathExtensionUtil.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/ext/XpathExtensionUtil.java?rev=1050572&r1=1050571&r2=1050572&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/ext/XpathExtensionUtil.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/ext/XpathExtensionUtil.java Sat Dec 18 02:32:39 2010
@@ -99,7 +99,7 @@ public class XpathExtensionUtil {
}
/**
- * Returns a Fucntion Context extension registered for given QName/namespaceURI+prefix+localName
+ * Returns a Function Context extension registered for given QName/namespaceURI+prefix+localName
* combination
*
* @param ctxt Synapse Message Context
@@ -133,13 +133,14 @@ public class XpathExtensionUtil {
* @param localName binding localname string in xpath expression
* @return Object variable resolved by corresponding extension
*/
- public static Object resolveVariableContext(MessageContext ctxt, String namespaceURI, String prefix,
- String localName) {
+ public static Object resolveVariableContext(MessageContext ctxt, String namespaceURI,
+ String prefix, String localName) {
SynapseEnvironment environment = ctxt.getEnvironment();
if (environment != null) {
Map<QName, SynapseXpathVariableResolver> extensions =
environment.getXpathVariableExtensions();
- SynapseXpathVariableResolver variableResolver = getMatchingExtensionProvider(extensions, namespaceURI, prefix, localName);
+ SynapseXpathVariableResolver variableResolver =
+ getMatchingExtensionProvider(extensions, namespaceURI, prefix, localName);
if (variableResolver != null) {
return resolveXpathVariable(variableResolver, ctxt);
}
@@ -159,7 +160,8 @@ public class XpathExtensionUtil {
* @return matching Extension provider. returns null if no extension is found for the given
* combination
*/
- private static <T> T getMatchingExtensionProvider(Map<QName, T> extensionMap, String namespaceURI,
+ private static <T> T getMatchingExtensionProvider(Map<QName, T> extensionMap,
+ String namespaceURI,
String prefix, String localName) {
QName subject;
if (localName != null && prefix != null) {
@@ -208,8 +210,9 @@ public class XpathExtensionUtil {
* @param ctxt Synapse Message Context
* @return Xpath Function instance . returns null if error occurs
*/
- private static Function initAndReturnXpathFunction(SynapseXpathFunctionContextProvider funcExtProvider,
- MessageContext ctxt) {
+ private static Function initAndReturnXpathFunction(
+ SynapseXpathFunctionContextProvider funcExtProvider,
+ MessageContext ctxt) {
try {
return funcExtProvider.getInitializedExtFunction(ctxt);
} catch (Exception e) {