Author: ruwan
Date: Mon Apr 6 07:48:52 2009
New Revision: 762240
URL: http://svn.apache.org/viewvc?rev=762240&view=rev
Log:
Refactoring, adding generics
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.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/MessageContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java?rev=762240&r1=762239&r2=762240&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/MessageContext.java
Mon Apr 6 07:48:52 2009
@@ -76,7 +76,7 @@
* context has already used. This will not lookup for the entries in the
Configuration.
* @return the set of local entries in the context
*/
- public Map getContextEntries();
+ public Map<String, Object> getContextEntries();
/**
* Sets the entries to the current context and not to the configuration.
This can be
@@ -371,7 +371,7 @@
*/
public void setTracingState(int tracingState);
- public Stack getFaultStack();
+ public Stack<FaultHandler> getFaultStack();
public void pushFaultHandler(FaultHandler fault);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java?rev=762240&r1=762239&r2=762240&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java
Mon Apr 6 07:48:52 2009
@@ -96,7 +96,7 @@
this.synEnv = synEnv;
}
- public Map getContextEntries() {
+ public Map<String, Object> getContextEntries() {
return localEntries;
}
@@ -352,7 +352,7 @@
this.tracingState= tracingState;
}
- public Stack getFaultStack() {
+ public Stack<FaultHandler> getFaultStack() {
return this.faultStack;
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java?rev=762240&r1=762239&r2=762240&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java
Mon Apr 6 07:48:52 2009
@@ -17,7 +17,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
-import org.apache.sandesha2.client.SandeshaClientConstants;
import org.apache.synapse.FaultHandler;
import org.apache.synapse.MessageContext;
import org.apache.synapse.SynapseException;
@@ -81,7 +80,7 @@
}
// Make deep copy of fault stack so that parent will not be lost it's
fault stack
- Stack faultStack = synCtx.getFaultStack();
+ Stack<FaultHandler> faultStack = synCtx.getFaultStack();
if (!faultStack.isEmpty()) {
List<FaultHandler> newFaultStack = new ArrayList<FaultHandler>();
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java?rev=762240&r1=762239&r2=762240&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java
Mon Apr 6 07:48:52 2009
@@ -40,9 +40,9 @@
private Map properties = new HashMap();
- private Map localEntries = new HashMap();
+ private Map<String, Object> localEntries = new HashMap<String, Object>();
- private Stack faultStack = new Stack();
+ private Stack<FaultHandler> faultStack = new Stack<FaultHandler>();
private SynapseConfiguration synCfg = null;
@@ -70,11 +70,11 @@
synEnv = se;
}
- public Map getContextEntries() {
+ public Map<String, Object> getContextEntries() {
return localEntries;
}
- public void setContextEntries(Map entries) {
+ public void setContextEntries(Map<String, Object> entries) {
this.localEntries = entries;
}
@@ -285,7 +285,7 @@
public void setSynapseContext(MessageContext env) {
}
- public Stack getFaultStack() {
+ public Stack<FaultHandler> getFaultStack() {
return faultStack;
}
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=762240&r1=762239&r2=762240&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 Apr 6 07:48:52 2009
@@ -170,7 +170,7 @@
mc.setEnvironment(se);
}
- public Map getContextEntries() {
+ public Map<String, Object> getContextEntries() {
return mc.getContextEntries();
}
@@ -350,7 +350,7 @@
mc.setTracingState(tracingState);
}
- public Stack getFaultStack() {
+ public Stack<FaultHandler> getFaultStack() {
return mc.getFaultStack();
}
