You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2010/08/22 15:15:38 UTC
svn commit: r987899 - in
/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators:
bsf/ spring/
Author: ruwan
Date: Sun Aug 22 13:15:38 2010
New Revision: 987899
URL: http://svn.apache.org/viewvc?rev=987899&view=rev
Log:
fixing some typos and re-formatting
Modified:
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/ScriptMessageContext.java
synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.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
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=987899&r1=987898&r2=987899&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 Sun Aug 22 13:15:38 2010
@@ -19,6 +19,7 @@
package org.apache.synapse.mediators.bsf;
+import com.sun.phobos.script.javascript.RhinoScriptEngineFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMText;
import org.apache.bsf.xml.XMLHelper;
@@ -28,16 +29,13 @@ import org.apache.synapse.SynapseLog;
import org.apache.synapse.config.Entry;
import org.apache.synapse.mediators.AbstractMediator;
-import javax.script.*;
import javax.activation.DataHandler;
-import java.util.TreeMap;
-import java.util.Map;
+import javax.script.*;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.IOException;
-
-import com.sun.phobos.script.javascript.RhinoScriptEngine;
-import com.sun.phobos.script.javascript.RhinoScriptEngineFactory;
+import java.io.InputStreamReader;
+import java.util.Map;
+import java.util.TreeMap;
/**
* A Synapse mediator that calls a function in any scripting language supported by the BSF.
@@ -233,7 +231,7 @@ public class ScriptMediator extends Abst
throws ScriptException, NoSuchMethodException {
prepareExternalScript(synCtx);
ScriptMessageContext scriptMC = new ScriptMessageContext(synCtx, xmlHelper);
- return invocableScript.invokeFunction(function, new Object[]{scriptMC});
+ return invocableScript.invokeFunction(function, scriptMC);
}
/**
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=987899&r1=987898&r2=987899&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 Sun Aug 22 13:15:38 2010
@@ -44,7 +44,7 @@ import java.util.TreeMap;
* </script>
* </pre>
* <p/>
- * The boolean response from the inlined mediator is either the response from the evaluation of the
+ * The boolean response from the in-lined 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/>
* The MessageContext passed in to the script mediator has additional methods over the Synapse
@@ -57,11 +57,11 @@ import java.util.TreeMap;
*/
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) {
@@ -70,7 +70,7 @@ public class ScriptMediatorFactory exten
"key"));
OMAttribute langAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
"language"));
- OMAttribute funcAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
+ OMAttribute functionAtt = elem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
"function"));
if (langAtt == null) {
@@ -78,7 +78,7 @@ public class ScriptMediatorFactory exten
" a script mediator");
// TODO: couldn't this be determined from the key in some scenarios?
}
- if (keyAtt == null && funcAtt != null) {
+ if (keyAtt == null && functionAtt != null) {
throw new SynapseException("Cannot use 'function' attribute without 'key' " +
"attribute for a script mediator");
}
@@ -86,7 +86,7 @@ public class ScriptMediatorFactory exten
Map<String, Object> includeKeysMap = getIncludeKeysMap(elem);
if (keyAtt != null) {
- String functionName = (funcAtt == null ? null : funcAtt.getAttributeValue());
+ String functionName = (functionAtt == null ? null : functionAtt.getAttributeValue());
mediator = new ScriptMediator(langAtt.getAttributeValue(),
includeKeysMap, keyAtt.getAttributeValue(), functionName);
} else {
@@ -105,9 +105,9 @@ public class ScriptMediatorFactory exten
// 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();
+ Iterator itr = elem.getChildrenWithName(INCLUDE_Q);
+ while (itr.hasNext()) {
+ OMElement includeElem = (OMElement) itr.next();
OMAttribute key = includeElem.getAttribute(new QName(XMLConfigConstants.NULL_NAMESPACE,
"key"));
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=987899&r1=987898&r2=987899&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 Aug 22 13:15:38 2010
@@ -52,6 +52,7 @@ import org.apache.commons.logging.LogFac
* ScriptMessageContext decorates the Synapse MessageContext adding methods to use the
* message payload XML in a way natural to the scripting languageS
*/
+@SuppressWarnings({"UnusedDeclaration"})
public class ScriptMessageContext implements MessageContext {
/** The actual Synapse message context reference */
@@ -69,7 +70,8 @@ public class ScriptMessageContext implem
* The payload is the first element inside the SOAP <Body> tags
*
* @return the XML SOAP Body
- * @throws ScriptException For erroing when geting the XML representation of SOAP Body payload
+ * @throws ScriptException in-case of an error in getting
+ * the XML representation of SOAP Body payload
*/
public Object getPayloadXML() throws ScriptException {
return xmlHelper.toScriptXML(mc.getEnvelope().getBody().getFirstElement());
@@ -79,8 +81,8 @@ public class ScriptMessageContext implem
* Set the SOAP body payload from XML
*
* @param payload Message payload
- * @throws ScriptException For errors in converitng xml To OM
- * @throws OMException For errors in OM manipulaion
+ * @throws ScriptException For errors in converting xml To OM
+ * @throws OMException For errors in OM manipulation
*/
public void setPayloadXML(Object payload) throws OMException, ScriptException {
@@ -130,7 +132,8 @@ public class ScriptMessageContext implem
/**
* Get the XML representation of the complete SOAP envelope
* @return return an object that represents the payload in the current scripting language
- * @throws ScriptException For erroing when geting the XML representation of SOAP envelope
+ * @throws ScriptException in-case of an error in getting
+ * the XML representation of SOAP envelope
*/
public Object getEnvelopeXML() throws ScriptException {
return xmlHelper.toScriptXML(mc.getEnvelope());
Modified: synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java?rev=987899&r1=987898&r2=987899&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java (original)
+++ synapse/trunk/java/modules/extensions/src/main/java/org/apache/synapse/mediators/spring/SpringMediator.java Sun Aug 22 13:15:38 2010
@@ -39,8 +39,9 @@ import org.springframework.core.io.Input
*
* A Spring mediator is instantiated by Spring (see www.springframework.org). The mediator
* refers to a Spring bean name, and also either a Spring configuration defined to Synapse
- * or an inlined Spring configuration.
+ * or an in-lined Spring configuration.
*/
+@SuppressWarnings({"UnusedDeclaration"})
public class SpringMediator extends AbstractMediator implements ManagedLifecycle {
/**
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=987899&r1=987898&r2=987899&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 Sun Aug 22 13:15:38 2010
@@ -34,6 +34,7 @@ import javax.xml.namespace.QName;
* <p/>
* <spring bean="exampleBean1" key="string""/>
*/
+@SuppressWarnings({"UnusedDeclaration"})
public class SpringMediatorFactory extends AbstractMediatorFactory {
private static final QName TAG_NAME =
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=987899&r1=987898&r2=987899&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 Sun Aug 22 13:15:38 2010
@@ -29,6 +29,7 @@ import org.apache.synapse.config.xml.Abs
/**
* <spring bean="exampleBean1" (config="spring1" | src="spring.xml)"/>
*/
+@SuppressWarnings({"UnusedDeclaration"})
public class SpringMediatorSerializer extends AbstractMediatorSerializer
implements MediatorSerializer {