You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/02/23 13:29:45 UTC
svn commit: r746986 - in /synapse/trunk/java/modules:
core/src/main/java/org/apache/synapse/audit/statistics/
core/src/main/java/org/apache/synapse/audit/statistics/view/
core/src/main/java/org/apache/synapse/config/xml/
core/src/main/java/org/apache/s...
Author: indika
Date: Mon Feb 23 12:29:42 2009
New Revision: 746986
URL: http://svn.apache.org/viewvc?rev=746986&view=rev
Log:
some improvements
genaric , for-each , use of final , doc change , code alignment , remove unused codes ....
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/StatisticsCollector.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/Statistics.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/StatisticsViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/SystemViewStrategy.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMessageContext.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java
synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/StatisticsCollector.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/StatisticsCollector.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/StatisticsCollector.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/StatisticsCollector.java Mon Feb 23 12:29:42 2009
@@ -53,14 +53,17 @@
}
/**
- * Returns a particular statistics view according to a given strategy for a given resource with particular type
+ * Returns a particular statistics view according to a given strategy for a given
+ * resource with particular type
*
* @param id Resource id
* @param type Type of the resource
* @param strategy Statistics viewing strategy
* @return Statistics view
*/
- public Map<String, Statistics> getStatistics(String id, int type, StatisticsViewStrategy strategy) {
+ public Map<String, Statistics> getStatistics(String id,
+ int type,
+ StatisticsViewStrategy strategy) {
return strategy.determineView(id, statisticsCollection, type);
}
@@ -71,7 +74,8 @@
* @param strategy strategy Statistics viewing strategy
* @return Statistics view
*/
- public Map<String, Map<String, Statistics>> getStatistics(int type, StatisticsViewStrategy strategy) {
+ public Map<String, Map<String, Statistics>> getStatistics(int type,
+ StatisticsViewStrategy strategy) {
return strategy.determineView(statisticsCollection, type);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserDomainViewStrategy.java Mon Feb 23 12:29:42 2009
@@ -29,12 +29,14 @@
public class PerUserDomainViewStrategy extends PerUserViewStrategy {
public Map<String, Map<String, Statistics>> determineView(
- List<StatisticsRecord> statisticsRecords, int type) {
+ List<StatisticsRecord> statisticsRecords,
+ int type) {
return determineView(statisticsRecords, type, DOMAIN);
}
public Map<String, Statistics> determineView(
- String id, List<StatisticsRecord> statisticsRecords, int type) {
+ String id, List<StatisticsRecord> statisticsRecords,
+ int type) {
return determineView(id, statisticsRecords, type, DOMAIN);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserIPViewStrategy.java Mon Feb 23 12:29:42 2009
@@ -29,12 +29,14 @@
public class PerUserIPViewStrategy extends PerUserViewStrategy {
public Map<String, Map<String, Statistics>> determineView(
- List<StatisticsRecord> statisticsRecords, int type) {
+ List<StatisticsRecord> statisticsRecords,
+ int type) {
return determineView(statisticsRecords, type, IP);
}
public Map<String, Statistics> determineView(
String id, List<StatisticsRecord> statisticsRecords, int type) {
- return determineView(id, statisticsRecords, type, IP);
+ return determineView(id, statisticsRecords,
+ type, IP);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/PerUserViewStrategy.java Mon Feb 23 12:29:42 2009
@@ -41,10 +41,13 @@
log = LogFactory.getLog(getClass());
}
- public Map<String, Map<String, Statistics>> determineView(List<StatisticsRecord> statisticsRecords,
- int type, int userIDType) {
+ public Map<String, Map<String, Statistics>> determineView(
+ List<StatisticsRecord> statisticsRecords,
+ int type,
+ int userIDType) {
- Map<String, Map<String, Statistics>> statisticsMap = new HashMap<String, Map<String, Statistics>>();
+ final Map<String, Map<String, Statistics>> statisticsMap =
+ new HashMap<String, Map<String, Statistics>>();
if (statisticsRecords == null) {
if (log.isDebugEnabled()) {
@@ -126,7 +129,8 @@
StatisticsLog statisticsLog = statisticsLogMap.get(rName);
if (statisticsLog == null) {
if (log.isDebugEnabled()) {
- log.debug("Statistics Logs cannot be found for resource with given name " + rName);
+ log.debug("Statistics Logs cannot be found for resource with given name " +
+ rName);
}
continue;
}
@@ -149,8 +153,10 @@
}
- public Map<String, Statistics> determineView(String id, List<StatisticsRecord> statisticsRecords,
- int type, int userIDType) {
+ public Map<String, Statistics> determineView(String id,
+ List<StatisticsRecord> statisticsRecords,
+ int type,
+ int userIDType) {
if (id == null || "".equals(id)) {
handleException("Resource Id cannot be null");
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/Statistics.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/Statistics.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/Statistics.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/Statistics.java Mon Feb 23 12:29:42 2009
@@ -133,7 +133,8 @@
}
public String toString() {
- return new StringBuffer().append("[Avg Processing Time : ").append(avgProcessingTime).append(" ]")
+ return new StringBuffer()
+ .append("[Avg Processing Time : ").append(avgProcessingTime).append(" ]")
.append(" [Max Processing Time : ").append(maxProcessingTime).append(" ]")
.append(" [Min Processing Time : ").append(minProcessingTime).append(" ]")
.append(" [Total Request Count : ").append(count).append(" ]")
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/StatisticsViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/StatisticsViewStrategy.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/StatisticsViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/StatisticsViewStrategy.java Mon Feb 23 12:29:42 2009
@@ -35,7 +35,9 @@
* @param type Type of resource
* @return A particular statistics view
*/
- public Map<String, Map<String, Statistics>> determineView(List<StatisticsRecord> statisticsRecords, int type);
+ public Map<String, Map<String, Statistics>> determineView(
+ List<StatisticsRecord> statisticsRecords,
+ int type);
/**
* Return a statistics view for a resource with given type and given name
@@ -45,5 +47,7 @@
* @param type Type of resource
* @return A particular statistics view
*/
- public Map<String, Statistics> determineView(String id, List<StatisticsRecord> statisticsRecords, int type);
+ public Map<String, Statistics> determineView(String id,
+ List<StatisticsRecord> statisticsRecords,
+ int type);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/SystemViewStrategy.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/SystemViewStrategy.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/SystemViewStrategy.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/audit/statistics/view/SystemViewStrategy.java Mon Feb 23 12:29:42 2009
@@ -35,9 +35,13 @@
private static final Log log = LogFactory.getLog(SystemViewStrategy.class);
- public Map<String, Map<String, Statistics>> determineView(List<StatisticsRecord> statisticsRecords, int type) {
+ public Map<String, Map<String, Statistics>> determineView(
+ List<StatisticsRecord> statisticsRecords,
+ int type) {
+
+ final Map<String, Map<String, Statistics>> statisticsMap =
+ new HashMap<String, Map<String, Statistics>>();
- Map<String, Map<String, Statistics>> statisticsMap = new HashMap<String, Map<String, Statistics>>();
if (statisticsRecords == null) {
if (log.isDebugEnabled()) {
log.debug("Statistics records cannot be found.");
@@ -87,7 +91,8 @@
StatisticsLog statisticsLog = statisticsLogMap.get(rName);
if (statisticsLog == null) {
if (log.isDebugEnabled()) {
- log.debug("Cannot find the statistics log for resource with name : " + rName);
+ log.debug("Cannot find the statistics log for resource with name : " +
+ rName);
}
continue;
}
@@ -104,7 +109,8 @@
}
if (statistics != null) {
- statistics.update(statisticsLog.getProcessingTime(), record.isFaultResponse());
+ statistics.update(statisticsLog.getProcessingTime(),
+ record.isFaultResponse());
}
}
}
@@ -116,7 +122,9 @@
}
- public Map<String, Statistics> determineView(String id, List<StatisticsRecord> statisticsRecords, int type) {
+ public Map<String, Statistics> determineView(String id,
+ List<StatisticsRecord> statisticsRecords,
+ int type) {
if (id == null || "".equals(id)) {
handleException("Resource Id cannot be null");
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java Mon Feb 23 12:29:42 2009
@@ -267,12 +267,6 @@
throw new SynapseException(msg);
}
- private static void handleException(String msg, Exception e) {
- log.error(msg, e);
- throw new SynapseException(msg, e);
- }
-
-
public QName getTagQName() {
return XMLConfigConstants.DEFINITIONS_ELT;
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CacheMediator.java Mon Feb 23 12:29:42 2009
@@ -100,9 +100,9 @@
}
// if maxMessageSize is specified check for the message size before processing
- FixedByteArrayOutputStream fbaos = null;
+
if (maxMessageSize > 0) {
- fbaos = new FixedByteArrayOutputStream(maxMessageSize);
+ FixedByteArrayOutputStream fbaos = new FixedByteArrayOutputStream(maxMessageSize);
try {
MessageHelper.cloneSOAPEnvelope(synCtx.getEnvelope()).serialize(fbaos);
} catch (XMLStreamException e) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java Mon Feb 23 12:29:42 2009
@@ -201,7 +201,7 @@
* Get the validation Source for the message context
*
* @param synCtx the current message to validate
- * @param synLog
+ * @param synLog SynapseLog instance
* @return the validation Source for the current message
*/
private Source getValidationSource(MessageContext synCtx, SynapseLog synLog) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java Mon Feb 23 12:29:42 2009
@@ -26,7 +26,6 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Connection;
-import java.util.Iterator;
/**
* Simple database table lookup mediator. Designed only for read/lookup
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/XSLTMediator.java Mon Feb 23 12:29:42 2009
@@ -360,9 +360,9 @@
/**
* Set the properties defined in the mediator as parameters on the stylesheet.
*
- * @param transformer
- * @param synCtx
- * @param synLog
+ * @param transformer Transformer instance
+ * @param synCtx MessageContext instance
+ * @param synLog SynapseLog instance
*/
private void applyProperties(Transformer transformer, MessageContext synCtx,
SynapseLog synLog) {
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java Mon Feb 23 12:29:42 2009
@@ -32,7 +32,6 @@
import javax.activation.DataHandler;
import java.util.TreeMap;
import java.util.Map;
-import java.util.Iterator;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.IOException;
@@ -70,9 +69,9 @@
*/
private String language;
/**
- * The map of included scripts; key = registry entry key, value = script source
+ * The map of included scripts; key = registry entry key, value = script source
*/
- private Map includes = new TreeMap();
+ private final Map<String, Object> includes;
/**
* The optional name of the function to be invoked, defaults to mediate
*/
@@ -98,11 +97,14 @@
*/
private Invocable invocableScript;
/**
- * The BSF helper to convert between the XML representations used by Java and the scripting language
+ * The BSF helper to convert between the XML representations used by Java
+ * and the scripting language
*/
private XMLHelper xmlHelper;
- /** Lock used to ensure thread-safe lookup of the object from the registry */
+ /**
+ * Lock used to ensure thread-safe lookup of the object from the registry
+ */
private final Object resourceLock = new Object();
/**
@@ -114,27 +116,30 @@
public ScriptMediator(String language, String scriptSourceCode) {
this.language = language;
this.scriptSourceCode = scriptSourceCode;
+ this.includes = new TreeMap<String, Object>();
initInlineScript();
}
/**
* Create a script mediator for the given language and given script entry key and function
*
- * @param language the BSF language
- * @param key the registry entry key to load the script
- * @param function the function to be invoked
+ * @param language the BSF language
+ * @param includeKeysMap Inclued script keys
+ * @param key the registry entry key to load the script
+ * @param function the function to be invoked
*/
- public ScriptMediator(String language, Map includeKeysMap, String key, String function) {
+ public ScriptMediator(String language, Map<String, Object> includeKeysMap,
+ String key, String function) {
this.language = language;
this.key = key;
this.includes = includeKeysMap;
if (function != null) {
this.function = function;
}
-
initScriptEngine();
if (!(scriptEngine instanceof Invocable)) {
- throw new SynapseException("Script engine is not an Invocable engine for language: " + language);
+ throw new SynapseException("Script engine is not an Invocable" +
+ " engine for language: " + language);
}
invocableScript = (Invocable) scriptEngine;
}
@@ -159,8 +164,8 @@
if (synLog.isTraceOrDebugEnabled()) {
synLog.traceOrDebug("Scripting language : " + language + " source " +
- (key == null ? ": specified inline " : " loaded with key : " + key) +
- (function != null ? " function : " + function : ""));
+ (key == null ? ": specified inline " : " loaded with key : " + key) +
+ (function != null ? " function : " + function : ""));
}
boolean returnValue;
@@ -199,15 +204,15 @@
} catch (ScriptException e) {
handleException("The script engine returned an error executing the " +
- (key == null ? "inlined " : "external ") + language + " script" +
- (key != null? " : " + key : "") +
- (function != null ? " function " + function : ""), e, synCtx);
+ (key == null ? "inlined " : "external ") + language + " script" +
+ (key != null ? " : " + key : "") +
+ (function != null ? " function " + function : ""), e, synCtx);
returnValue = false;
} catch (NoSuchMethodException e) {
handleException("The script engine returned a NoSuchMethodException executing the " +
- (key == null ? "inlined " : "external ") + language + " script" +
- (key != null? " : " + key : "") +
- (function != null ? " function " + function : ""), e, synCtx);
+ (key == null ? "inlined " : "external ") + language + " script" +
+ (key != null ? " : " + key : "") +
+ (function != null ? " function " + function : ""), e, synCtx);
returnValue = false;
}
return returnValue;
@@ -218,9 +223,11 @@
*
* @param synCtx the message context
* @return script result
- * @throws ScriptException
+ * @throws ScriptException For any errors , when comiple , run the script
+ * @throws NoSuchMethodException If the funcation is not defined in the script
*/
- protected Object mediateWithExternalScript(MessageContext synCtx) throws ScriptException, NoSuchMethodException {
+ private Object mediateWithExternalScript(MessageContext synCtx)
+ throws ScriptException, NoSuchMethodException {
prepareExternalScript(synCtx);
ScriptMessageContext scriptMC = new ScriptMessageContext(synCtx, xmlHelper);
return invocableScript.invokeFunction(function, new Object[]{scriptMC});
@@ -231,9 +238,9 @@
*
* @param synCtx message context
* @return true, or the script return value
- * @throws ScriptException
+ * @throws ScriptException For any errors , when comiple , run the script
*/
- protected Object mediateForInlineScript(MessageContext synCtx) throws ScriptException {
+ private Object mediateForInlineScript(MessageContext synCtx) throws ScriptException {
ScriptMessageContext scriptMC = new ScriptMessageContext(synCtx, xmlHelper);
@@ -260,15 +267,16 @@
if (scriptEngine instanceof Compilable) {
if (log.isDebugEnabled()) {
- log.debug("Script engine supports Compilable interface, compiling script code..");
+ log.debug("Script engine supports Compilable interface, " +
+ "compiling script code..");
}
- compiledScript = ((Compilable)scriptEngine).compile(scriptSourceCode);
+ compiledScript = ((Compilable) scriptEngine).compile(scriptSourceCode);
} else {
// do nothing. If the script enging doesn't support Compilable then
// the inline script will be evaluated on each invocation
if (log.isDebugEnabled()) {
log.debug("Script engine does not support the Compilable interface, " +
- "inlined script would be evaluated on each invocation..");
+ "inlined script would be evaluated on each invocation..");
}
}
@@ -280,16 +288,19 @@
/**
* Prepares the mediator for the invocation of an external script
*
- * @throws ScriptException
+ * @param synCtx MessageContext script
+ * @throws ScriptException For any errors , when comiple the script
*/
- protected synchronized void prepareExternalScript(MessageContext synCtx) throws ScriptException {
+ protected synchronized void prepareExternalScript(MessageContext synCtx)
+ throws ScriptException {
// TODO: only need this synchronized method for dynamic registry entries. If there was a way
// to access the registry entry during mediator initialization then for non-dynamic entries
// this could be done just the once during mediator initialization.
Entry entry = synCtx.getConfiguration().getEntryDefinition(key);
- boolean needsReload = (entry != null) && entry.isDynamic() && (!entry.isCached() || entry.isExpired());
+ boolean needsReload = (entry != null) && entry.isDynamic() &&
+ (!entry.isCached() || entry.isExpired());
synchronized (resourceLock) {
if (scriptSourceCode == null || needsReload) {
Object o = synCtx.getEntry(key);
@@ -329,8 +340,7 @@
}
// load <include /> scripts; reload each script if needed
- for (Iterator iter = includes.keySet().iterator(); iter.hasNext();) {
- String includeKey = (String) iter.next();
+ for (String includeKey : includes.keySet()) {
String includeSourceCode = (String) includes.get(includeKey);
Entry includeEntry = synCtx.getConfiguration().getEntryDefinition(includeKey);
boolean includeEntryNeedsReload = (includeEntry != null) && includeEntry.isDynamic()
@@ -389,7 +399,7 @@
this.multiThreadedEngine = scriptEngine.getFactory().getParameter("THREADING") != null;
log.debug("Script mediator for language : " + language +
- " supports multithreading? : " + multiThreadedEngine);
+ " supports multithreading? : " + multiThreadedEngine);
}
public String getLanguage() {
@@ -413,12 +423,8 @@
throw new SynapseException(msg);
}
- public Map getIncludeMap() {
- return includes;
+ public Map<String, Object> getIncludeMap() {
+ return includes;
}
- public void setIncludeMap(Map includeMap) {
- this.includes = includeMap;
- }
-
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorFactory.java Mon Feb 23 12:29:42 2009
@@ -35,48 +35,55 @@
/**
* Creates an instance of a Script mediator for inline or external script mediation for BSF
* scripting languages.
- *
- * * <pre>
+ * <p/>
+ * * <pre>
* <script [key="entry-key"]
* [function="script-function-name"] language="javascript|groovy|ruby">
* (text | xml)?
* <include key="entry-key" />
* </script>
* </pre>
- *
+ * <p/>
* The boolean response from the inlined mediator is either the response from the evaluation of the
* script statements or if that result is not a boolean then a response of true is assumed.
- * <p>
+ * <p/>
* The MessageContext passed in to the script mediator has additional methods over the Synapse
* MessageContext to enable working with the XML in a way natural to the scripting language. For
* example when using JavaScript get/setPayloadXML use E4X XML objects, when using Ruby they
* use REXML documents.
- *
+ * <p/>
* For external script mediation, that is when using key, function, language attributes,
* <include key"entry-key" /> is used to include one or more additional script files.
*/
public class ScriptMediatorFactory extends AbstractMediatorFactory {
- private static final QName TAG_NAME = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "script");
+ private static final QName TAG_NAME = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE,
+ "script");
- private static final QName INCLUDE_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "include");
+ private static final QName INCLUDE_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE,
+ "include");
public Mediator createMediator(OMElement elem) {
ScriptMediator mediator;
- OMAttribute keyAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "key"));
- OMAttribute langAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "language"));
- OMAttribute funcAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "function"));
+ OMAttribute keyAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
+ "key"));
+ OMAttribute langAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
+ "language"));
+ OMAttribute funcAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
+ "function"));
if (langAtt == null) {
- throw new SynapseException("The 'language' attribute is required for a script mediator");
+ throw new SynapseException("The 'language' attribute is required for" +
+ " a script mediator");
// TODO: couldn't this be determined from the key in some scenarios?
}
if (keyAtt == null && funcAtt != null) {
- throw new SynapseException("Cannot use 'function' attribute without 'key' attribute for a script mediator");
+ throw new SynapseException("Cannot use 'function' attribute without 'key' " +
+ "attribute for a script mediator");
}
- Map includeKeysMap = getIncludeKeysMap(elem);
+ Map<String, Object> includeKeysMap = getIncludeKeysMap(elem);
if (keyAtt != null) {
String functionName = (funcAtt == null ? null : funcAtt.getAttributeValue());
@@ -90,20 +97,23 @@
return mediator;
}
- private Map getIncludeKeysMap(OMElement elem) {
- // get <include /> scripts
- // map key = registry entry key, value = script source
- // at this time map values are null, later loaded
- // from void ScriptMediator.prepareExternalScript(MessageContext synCtx)
+ private Map<String, Object> getIncludeKeysMap(OMElement elem) {
+ // get <include /> scripts
+ // map key = registry entry key, value = script source
+ // at this time map values are null, later loaded
+ // from void ScriptMediator.prepareExternalScript(MessageContext synCtx)
- Map includeKeysMap = new TreeMap(); // TreeMap used to keep given scripts order if needed
+ // TreeMap used to keep given scripts order if needed
+ Map<String, Object> includeKeysMap = new TreeMap<String, Object>();
Iterator iter = elem.getChildrenWithName(INCLUDE_Q);
while (iter.hasNext()) {
OMElement includeElem = (OMElement) iter.next();
- OMAttribute key = includeElem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "key"));
+ OMAttribute key = includeElem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
+ "key"));
if (key == null) {
- throw new SynapseException("Cannot use 'include' element without 'key' attribute for a script mediator");
+ throw new SynapseException("Cannot use 'include' element without 'key'" +
+ " attribute for a script mediator");
}
String keyText = key.getAttributeValue();
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializer.java Mon Feb 23 12:29:42 2009
@@ -18,28 +18,24 @@
*/
package org.apache.synapse.mediators.bsf;
-import java.util.Iterator;
import java.util.Map;
import javax.xml.stream.XMLStreamConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.llom.OMTextImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.config.xml.AbstractMediatorSerializer;
/**
* Serializer for a script mediator
+ *
* @see org.apache.synapse.mediators.bsf.ScriptMediatorFactory
*/
public class ScriptMediatorSerializer extends AbstractMediatorSerializer {
- private static final Log log = LogFactory.getLog(ScriptMediatorSerializer.class);
-
public OMElement serializeMediator(OMElement parent, Mediator m) {
- if (!(m instanceof ScriptMediator) ) {
+ if (!(m instanceof ScriptMediator)) {
handleException("Unsupported mediator passed in for serialization : " + m.getType());
}
@@ -58,18 +54,19 @@
}
} else {
script.addAttribute(fac.createOMAttribute("language", nullNS, language));
- OMTextImpl textData = (OMTextImpl) fac.createOMText(scriptMediator.getScriptSrc().trim());
+ OMTextImpl textData = (OMTextImpl) fac.createOMText(
+ scriptMediator.getScriptSrc().trim());
textData.setType(XMLStreamConstants.CDATA);
script.addChild(textData);
}
-
- Map includeMap = scriptMediator.getIncludeMap();
- Iterator iterIncludeMap = includeMap.keySet().iterator();
- while(iterIncludeMap.hasNext()) {
- String includeKey = (String) iterIncludeMap.next();
- OMElement includeKeyElement = fac.createOMElement("include", synNS);
- includeKeyElement.addAttribute(fac.createOMAttribute("key", nullNS, includeKey));
- script.addChild(includeKeyElement);
+
+ Map<String, Object> includeMap = scriptMediator.getIncludeMap();
+ for (String includeKey : includeMap.keySet()) {
+ if (includeKey != null && includeKey.length() != 0) {
+ OMElement includeKeyElement = fac.createOMElement("include", synNS);
+ includeKeyElement.addAttribute(fac.createOMAttribute("key", nullNS, includeKey));
+ script.addChild(includeKeyElement);
+ }
}
saveTracingState(script, scriptMediator);
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=746986&r1=746985&r2=746986&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 Mon Feb 23 12:29:42 2009
@@ -48,9 +48,9 @@
public class ScriptMessageContext implements MessageContext {
/** The actual Synapse message context reference */
- private MessageContext mc;
+ private final MessageContext mc;
/** The OMElement to scripting language object converter for the selected language */
- private XMLHelper xmlHelper;
+ private final XMLHelper xmlHelper;
public ScriptMessageContext(MessageContext mc, XMLHelper xmlHelper) {
this.mc = mc;
@@ -58,24 +58,22 @@
}
/**
- * Get the XML representation of SOAP Body payload.
+ * Get the XML representation of SOAP Body payload.
* The payload is the first element inside the SOAP <Body> tags
- *
+ *
* @return the XML SOAP Body
- * @throws ScriptException
- * @throws OMException
+ * @throws ScriptException For erroing when geting the XML representation of SOAP Body payload
*/
- public Object getPayloadXML() throws OMException, ScriptException {
+ public Object getPayloadXML() throws ScriptException {
return xmlHelper.toScriptXML(mc.getEnvelope().getBody().getFirstElement());
}
/**
* Set the SOAP body payload from XML
- *
- * @param payload
- * @throws ScriptException
- * @throws OMException
- *
+ *
+ * @param payload Message payload
+ * @throws ScriptException For errors in converitng xml To OM
+ * @throws OMException For errors in OM manipulaion
*/
public void setPayloadXML(Object payload) throws OMException, ScriptException {
@@ -87,7 +85,7 @@
/**
* Get the XML representation of the complete SOAP envelope
* @return return an object that represents the payload in the current scripting language
- * @throws ScriptException
+ * @throws ScriptException For erroing when geting the XML representation of SOAP envelope
*/
public Object getEnvelopeXML() throws ScriptException {
return xmlHelper.toScriptXML(mc.getEnvelope());
@@ -97,12 +95,15 @@
public void setTo(String reference) {
mc.setTo(new EndpointReference(reference));
}
+
public void setFaultTo(String reference) {
mc.setFaultTo(new EndpointReference(reference));
}
+
public void setFrom(String reference) {
mc.setFrom(new EndpointReference(reference));
}
+
public void setReplyTo(String reference) {
mc.setReplyTo(new EndpointReference(reference));
}
@@ -128,7 +129,7 @@
return mc.getContextEntries();
}
- public void setContextEntries(Map entries) {
+ public void setContextEntries(Map<String, Object> entries) {
mc.setContextEntries(entries);
}
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorFactory.java Mon Feb 23 12:29:42 2009
@@ -21,8 +21,6 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.config.xml.AbstractMediatorFactory;
@@ -38,9 +36,8 @@
*/
public class SpringMediatorFactory extends AbstractMediatorFactory {
- private static final Log log = LogFactory.getLog(SpringMediatorFactory.class);
-
- private static final QName TAG_NAME = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE + "/spring", "spring");
+ private static final QName TAG_NAME =
+ new QName(XMLConfigConstants.SYNAPSE_NAMESPACE + "/spring", "spring");
/**
* Create a Spring mediator instance referring to the bean and configuration given
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediatorSerializer.java Mon Feb 23 12:29:42 2009
@@ -21,8 +21,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.config.xml.XMLConfigConstants;
import org.apache.synapse.config.xml.MediatorSerializer;
@@ -34,9 +32,8 @@
public class SpringMediatorSerializer extends AbstractMediatorSerializer
implements MediatorSerializer {
- private static final OMNamespace sprNS = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE+"/spring", "spring");
-
- private static final Log log = LogFactory.getLog(SpringMediatorSerializer.class);
+ private static final OMNamespace sprNS =
+ fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE+"/spring", "spring");
public OMElement serializeMediator(OMElement parent, Mediator m) {
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorFactory.java Mon Feb 23 12:29:42 2009
@@ -20,8 +20,6 @@
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.config.xml.AbstractMediatorFactory;
import org.apache.synapse.config.xml.SequenceMediatorFactory;
@@ -44,8 +42,6 @@
public class ThrottleMediatorFactory extends AbstractMediatorFactory {
- private static final Log log = LogFactory.getLog(ThrottleMediatorFactory.class);
-
/**
* The Tag Name for throttle
*/
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/throttle/ThrottleMediatorSerializer.java Mon Feb 23 12:29:42 2009
@@ -19,10 +19,7 @@
package org.apache.synapse.mediators.throttle;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.synapse.Mediator;
import org.apache.synapse.config.xml.AbstractMediatorSerializer;
import org.apache.synapse.config.xml.SequenceMediatorSerializer;
@@ -43,11 +40,6 @@
public class ThrottleMediatorSerializer extends AbstractMediatorSerializer {
- private static final Log log = LogFactory.getLog(ThrottleMediatorSerializer.class);
-
- private static final OMNamespace throttleNS
- = fac.createOMNamespace(XMLConfigConstants.SYNAPSE_NAMESPACE, "throttle");
-
public OMElement serializeMediator(OMElement parent, Mediator m) {
if (!(m instanceof ThrottleMediator)) {
handleException("Invalid Mediator has passed to serializer");
@@ -70,14 +62,15 @@
saveTracingState(throttle, throttleMediator);
String id = throttleMediator.getId();
- if(id != null){
+ if (id != null) {
throttle.addAttribute(fac.createOMAttribute(
"id", nullNS, id));
}
-
+
String onReject = throttleMediator.getOnRejectSeqKey();
if (onReject != null) {
- throttle.addAttribute(fac.createOMAttribute(XMLConfigConstants.ONREJECT, nullNS, onReject));
+ throttle.addAttribute(fac.createOMAttribute(XMLConfigConstants.ONREJECT, nullNS,
+ onReject));
} else {
Mediator mediator = throttleMediator.getOnRejectMediator();
SequenceMediatorSerializer serializer = new SequenceMediatorSerializer();
@@ -90,7 +83,8 @@
}
String onAccept = throttleMediator.getOnAcceptSeqKey();
if (onAccept != null) {
- throttle.addAttribute(fac.createOMAttribute(XMLConfigConstants.ONACCEPT, nullNS, onAccept));
+ throttle.addAttribute(fac.createOMAttribute(XMLConfigConstants.ONACCEPT, nullNS,
+ onAccept));
} else {
Mediator mediator = throttleMediator.getOnAcceptMediator();
SequenceMediatorSerializer serializer = new SequenceMediatorSerializer();
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/MediatorCustomVariable.java Mon Feb 23 12:29:42 2009
@@ -22,7 +22,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.commons.logging.Log;
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediator.java Mon Feb 23 12:29:42 2009
@@ -41,7 +41,6 @@
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
import javax.activation.DataHandler;
import java.io.StringReader;
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorFactory.java Mon Feb 23 12:29:42 2009
@@ -58,8 +58,10 @@
public Mediator createMediator(OMElement elem) {
XQueryMediator xQueryMediator = new XQueryMediator();
- OMAttribute xqueryKey = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "key"));
- OMAttribute attrTarget = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE, "target"));
+ OMAttribute xqueryKey = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
+ "key"));
+ OMAttribute attrTarget = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
+ "target"));
if (xqueryKey != null) {
String queryKey = xqueryKey.getAttributeValue();
if (queryKey != null) {
@@ -77,7 +79,8 @@
xQueryMediator.setQuerySource(targetValue);
xQueryMediator.setTarget(SynapseXPathFactory.getSynapseXPath(elem, ATT_TARGET));
} catch (JaxenException e) {
- handleException("Invalid XPath specified for the target attribute : " + targetValue);
+ handleException("Invalid XPath specified for the target attribute : " +
+ targetValue);
}
}
}
@@ -91,7 +94,8 @@
MediatorPropertyFactory.getMediatorProperties(dataSource));
}
- Iterator it = elem.getChildrenWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "variable"));
+ Iterator it = elem.getChildrenWithName(new QName(XMLConfigConstants.SYNAPSE_NAMESPACE,
+ "variable"));
while (it.hasNext()) {
OMElement variableOM = (OMElement) it.next();
String name = variableOM.getAttributeValue(ATT_NAME_Q);
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/xquery/XQueryMediatorSerializer.java Mon Feb 23 12:29:42 2009
@@ -60,7 +60,8 @@
saveTracingState(xquery, queryMediator);
SynapseXPath targetXPath = queryMediator.getTarget();
- if (targetXPath != null && !SourceXPathSupport.DEFAULT_XPATH.equals(targetXPath.toString())) {
+ if (targetXPath != null &&
+ !SourceXPathSupport.DEFAULT_XPATH.equals(targetXPath.toString())) {
SynapseXPathSerializer.serializeXPath(targetXPath, xquery, "target");
}
@@ -133,8 +134,10 @@
"key", nullNS, regkey));
}
SynapseXPath expression = variable.getExpression();
- if (expression != null && !SourceXPathSupport.DEFAULT_XPATH.equals(expression.toString())) {
- SynapseXPathSerializer.serializeXPath(expression, customElement, "expression");
+ if (expression != null &&
+ !SourceXPathSupport.DEFAULT_XPATH.equals(expression.toString())) {
+ SynapseXPathSerializer.serializeXPath(expression,
+ customElement, "expression");
}
String type = null;
int varibelType = variable.getType();
Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java Mon Feb 23 12:29:42 2009
@@ -33,8 +33,6 @@
private static final String inlinescript = "var state=5;";
- private String randomno = null;
-
private String threadsafetyscript = "var rno = mc.getPayloadXML().toString(); rno=rno*2; mc.setPayloadXML" +
"(<randomNo>{rno}</randomNo>)";
@@ -47,7 +45,7 @@
public void testThreadSafety() throws Exception {
MessageContext mc = TestUtils.getTestContext("<randomNo/>", null);
Random rand = new Random();
- randomno = new Integer(rand.nextInt(200)).toString();
+ String randomno = Integer.toString(rand.nextInt(200));
mc.getEnvelope().getBody().getFirstElement().setText(randomno);
ScriptMediator mediator = new ScriptMediator("js", threadsafetyscript);
mediator.mediate(mc);
Modified: synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java?rev=746986&r1=746985&r2=746986&view=diff
==============================================================================
--- synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java (original)
+++ synapse/trunk/java/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformationRepositoryHelper.java Mon Feb 23 12:29:42 2009
@@ -41,8 +41,9 @@
* @param axisConfiguration AxisConfiguration instance
* @param properties DataSources configuration properties
*/
- public static void initializeDataSourceInformationRepository(AxisConfiguration axisConfiguration,
- Properties properties) {
+ public static void initializeDataSourceInformationRepository(
+ AxisConfiguration axisConfiguration,
+ Properties properties) {
DataSourceInformationRepository repository =
getDataSourceInformationRepository(axisConfiguration);
@@ -79,9 +80,10 @@
* @param properties DataSources configuration properties
* @param listener DataSourceInformationRepositoryListener instance
*/
- public static void initializeDataSourceInformationRepository(AxisConfiguration axisConfiguration,
- Properties properties,
- DataSourceInformationRepositoryListener listener) {
+ public static void initializeDataSourceInformationRepository(
+ AxisConfiguration axisConfiguration,
+ Properties properties,
+ DataSourceInformationRepositoryListener listener) {
DataSourceInformationRepository repository =
DataSourceInformationRepositoryFactory.createDataSourceInformationRepository(