[jboss-svn-commits] JBL Code SVN: r6720 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions product/core/listeners/src/org/jboss/soa/esb/actions/converters product/core/listeners/src/org/jboss/soa/esb/actions/routing product/core/listeners/src/org/jboss/soa/esb/actions/templates product/core/listeners/src/org/jboss/soa/esb/listeners product/core/listeners/tests/src/org/jboss/soa/esb/actions product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters product/core/listeners/tests/src/org/jboss/soa/esb/listeners product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions qa/junit/src/org/jboss/soa/esb/listeners
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 10 09:15:55 EDT 2006
Author: tfennelly
Date: 2006-10-10 09:15:34 -0400 (Tue, 10 Oct 2006)
New Revision: 6720
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractFileAction.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/ObjectToFileWriter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockAction.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockFileAction.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockSqlRowAction.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformerUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToFileWriterUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java
labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/AbstractListenerTest.java
labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java
labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditRequest.java
labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java
labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/MessageBox.java
Log:
Fixed up getter and setter names as with http://jira.jboss.com/jira/browse/JBESB-189
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractFileAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractFileAction.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractFileAction.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -52,7 +52,7 @@
*/
public final Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
if(!(oCurr instanceof File)) {
throw new ActionProcessingException
("Message current object for processing by " + getClass().getName()
@@ -61,7 +61,7 @@
}
// Call the implementing class to process the file message...
- ActionUtils.putCurrentObject(message,process((File)oCurr));
+ ActionUtils.setTaskObject(message,process((File)oCurr));
return message;
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/AbstractSqlRowAction.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -28,7 +28,7 @@
}
public final Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
if (!(oCurr instanceof Map)) {
throw new ActionProcessingException(
"Message object for processing by "
@@ -36,7 +36,7 @@
+ " should have been preprocessed and supplied as a "
+ Map.class.getName() + " instance.");
}
- ActionUtils.putCurrentObject(message,process((Map)oCurr));
+ ActionUtils.setTaskObject(message,process((Map)oCurr));
return message;
} // ________________________________
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ActionUtils.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -35,11 +35,11 @@
public static final String CURRENT_OBJECT="org.jboss.soa.esb.actions.current.after";
/**
- * Obtain current object from standard spot within message
+ * Obtain the current object from standard spot within message
* @param message - from where to obtain the 'current object'
* @return Object stored in Body with key ActionProcessor.CURRENT_OBJECT
*/
- public static Object currentFromMessage(Message message)
+ public static Object getTaskObject(Message message)
{
return (null==message)? null : message.getBody().get(CURRENT_OBJECT);
}
@@ -48,7 +48,7 @@
* @param message - from where to obtain the value
* @return Object stored in Body with key ActionProcessor.BEFORE_ACTION
*/
- public static Object currentBeforeAction(Message message)
+ public static Object getTaskBeforeObject(Message message)
{
return (null==message)? null : message.getBody().get(BEFORE_ACTION);
}
@@ -69,7 +69,7 @@
* @param obj - Object to store - Won't be stored if <null>
* @return Object previous 'current object'
*/
- public static Object putCurrentObject(Message message, Object obj)
+ public static Object setTaskObject(Message message, Object obj)
{
Object oRet = message.getBody().remove(CURRENT_OBJECT);
if (null!=obj)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/SmooksTransformer.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -136,7 +136,7 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#process(java.lang.Object)
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
try {
if(oCurr instanceof String) {
byte[] messageBytes = null;
@@ -158,7 +158,7 @@
logger.debug("Transformed message for useragent [" + messageUseragent + "]. Time taken: "
+ timeTaken + ". Message in:\n[" + oCurr.toString()+ "]. \nMessage out:\n[" + transformedMessage + "].");
}
- ActionUtils.putCurrentObject(message,transformedMessage);
+ ActionUtils.setTaskObject(message,transformedMessage);
} else {
String sClass = (null==oCurr) ? "<null>" : oCurr.getClass().getName();
logger.warn("String message types only supported. Input message was ["
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ByteArrayToString.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -64,13 +64,13 @@
byte[] bytes;
try {
- bytes = (byte[])ActionUtils.currentFromMessage(message);
+ bytes = (byte[])ActionUtils.getTaskObject(message);
} catch(ClassCastException e) {
throw new ActionProcessingException("Message must be an array of bytes. Is " + message.getClass().getName());
}
try {
- ActionUtils.putCurrentObject(message,new String(bytes, encoding));
+ ActionUtils.setTaskObject(message,new String(bytes, encoding));
return message;
} catch (UnsupportedEncodingException e) {
throw new ActionProcessingException("Unable to decode byte[] to String. Unsupported character encoding configuration: " + encoding, e);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToCSVString.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -98,7 +98,7 @@
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
Class oCurrClass = (null==oCurr) ? null : oCurr.getClass();
StringBuffer csv = new StringBuffer();
boolean hasAppendStarted = false; // Have we appended a value yet?
@@ -128,7 +128,7 @@
logger.error("Exception calling bean method: " + methodName, e);
}
}
- ActionUtils.putCurrentObject(message,csv.toString());
+ ActionUtils.setTaskObject(message,csv.toString());
return message;
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectToXStream.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -74,7 +74,7 @@
*/
public Message process(Message message) throws ActionProcessingException {
- Object object = ActionUtils.currentFromMessage(message);
+ Object object = ActionUtils.getTaskObject(message);
XStream xstream = new XStream();
if(classAlias == null) {
@@ -87,7 +87,7 @@
xstream.alias(classAlias, object.getClass());
}
- ActionUtils.putCurrentObject(message,xstream.toXML(object));
+ ActionUtils.setTaskObject(message,xstream.toXML(object));
return message;
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/FileCopier.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -134,14 +134,14 @@
} // __________________________________
public Serializable getOkNotification(Message message) {
- Object currentObject = ActionUtils.currentFromMessage(message);
+ Object currentObject = ActionUtils.getTaskObject(message);
return "File " + ((WorkingFile)currentObject).getInputFile().getAbsolutePath()
+ " successfully copied to all destination";
}
public Serializable getErrorNotification(Message message) {
- Object currentObject = ActionUtils.currentFromMessage(message);
+ Object currentObject = ActionUtils.getTaskObject(message);
return "File " + ((WorkingFile)currentObject).getInputFile().getAbsolutePath()
+ " to configured destination";
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -101,7 +101,7 @@
public org.jboss.soa.esb.message.Message
process(org.jboss.soa.esb.message.Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
if(!(oCurr instanceof Serializable)) {
throw new ActionProcessingException("Cannot send Object [" + oCurr.getClass().getName() + "] to destination [" + queueSetup.queueName + "]. Object must be serializable.");
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/ObjectToFileWriter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/ObjectToFileWriter.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/ObjectToFileWriter.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -120,7 +120,7 @@
throw new ActionProcessingException("Action " + actionName + " failed. Unable to open output file " + outputFile.getAbsolutePath());
}
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
try {
if(oCurr instanceof byte[]) {
fileOutputStream.write((byte[])oCurr);
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockAction.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockAction.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -24,7 +24,7 @@
private static Logger logger = Logger.getLogger(MockAction.class);
public Message process(Message message) {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
if (null==oCurr)
oCurr = "null";
logger.info("process was called with <<" + oCurr.toString() + ">>");
@@ -39,13 +39,13 @@
}
public Serializable getOkNotification(Message message) {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
return getStamp() + " Notif OK - <"
+ ((null == oCurr) ? "null" : oCurr.toString()) + ">";
} // ________________________________
public Serializable getErrorNotification(Message message) {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
return getStamp() + " Notif ERROR - <"
+ ((null == oCurr) ? "null" : message.toString()) + ">";
} // ________________________________
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockFileAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockFileAction.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockFileAction.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -38,14 +38,14 @@
public Serializable getOkNotification(Message message)
{
return getStamp()+" Notif OK - <"
- +ActionUtils.currentFromMessage(message)
+ +ActionUtils.getTaskObject(message)
+">";
} //________________________________
public Serializable getErrorNotification(Message message)
{
return getStamp()+" Notif ERROR - <"
- +ActionUtils.currentFromMessage(message)
+ +ActionUtils.getTaskObject(message)
+">";
} //________________________________
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockSqlRowAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockSqlRowAction.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templates/MockSqlRowAction.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -49,14 +49,14 @@
public Serializable getOkNotification(Message message)
{
return getStamp()+" Notif OK - <"
- +ActionUtils.currentFromMessage(message)
+ +ActionUtils.getTaskObject(message)
+">";
} //________________________________
public Serializable getErrorNotification(Message message)
{
return getStamp()+" Notif ERROR - <"
- +ActionUtils.currentFromMessage(message)
+ +ActionUtils.getTaskObject(message)
+">";
} //________________________________
} //____________________________________________________________________________
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -209,7 +209,7 @@
message = (Message)initialObject;
} else {
message = m_oMsgFactory.getMessage();
- ActionUtils.putCurrentObject(message,initialObject);
+ ActionUtils.setTaskObject(message,initialObject);
}
actions = getActions(message);
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformerUnitTest.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/SmooksTransformerUnitTest.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -93,9 +93,9 @@
SmooksTransformer transformer = new SmooksTransformer("trans", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.putCurrentObject(oMsg,stringMessage);
+ ActionUtils.setTaskObject(oMsg,stringMessage);
oMsg = transformer.process(oMsg);
- return (String) ActionUtils.currentFromMessage(oMsg);
+ return (String) ActionUtils.getTaskObject(oMsg);
}
private void assertConfigException(List<KeyValuePair> properties, String expectedException) {
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor1.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -49,7 +49,7 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
public Message process(Message message) throws ActionProcessingException {
- logger.info("Processing action [" + name + "]: " + ActionUtils.currentFromMessage(message));
+ logger.info("Processing action [" + name + "]: " + ActionUtils.getTaskObject(message));
return super.process(message);
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor2.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -40,7 +40,7 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
public Message process(Message message) throws ActionProcessingException {
- logger.info("Processing action: " + ActionUtils.currentFromMessage(message));
+ logger.info("Processing action: " + ActionUtils.getTaskObject(message));
return super.process(message);
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/TestActionProcessor3.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -40,7 +40,7 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
public Message process(Message message) throws ActionProcessingException {
- System.out.println("processAction: " + ActionUtils.currentFromMessage(message));
+ System.out.println("processAction: " + ActionUtils.getTaskObject(message));
return super.process(message);
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/ToNowhereRouter.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -40,7 +40,7 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
public Message process(Message msg) throws ActionProcessingException {
- objects.add(ActionUtils.currentFromMessage(msg));
+ objects.add(ActionUtils.getTaskObject(msg));
System.out.println("ToNowhereRouter");
return msg;
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ByteArrayToStringUnitTest.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -53,9 +53,9 @@
String sTest = "TestString";
Message msg = MessageFactory.getInstance().getMessage();
- ActionUtils.putCurrentObject(msg,sTest.getBytes());
+ ActionUtils.setTaskObject(msg,sTest.getBytes());
byteArrayToString.process(msg);
- String decodedBytes = (String)ActionUtils.currentFromMessage(msg);
+ String decodedBytes = (String)ActionUtils.getTaskObject(msg);
assertEquals(sTest, decodedBytes);
}
}
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/LongToDateConverter.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -45,7 +45,7 @@
*/
public Message process(Message message) throws ActionProcessingException
{
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
if (!(oCurr instanceof Long))
{
throw new ActionProcessingException(
@@ -53,7 +53,7 @@
}
System.out.println("LongToDateConverter");
- try { ActionUtils.putCurrentObject(message,new Date((Long)oCurr)); }
+ try { ActionUtils.setTaskObject(message,new Date((Long)oCurr)); }
catch (Exception e)
{ throw new ActionProcessingException(e); }
return message;
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToCSVStringUnitTest.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -48,30 +48,30 @@
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "name"));
ObjectToCSVString processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.putCurrentObject(oMsg,new TestBean());
+ ActionUtils.setTaskObject(oMsg,new TestBean());
oMsg = processor.process(oMsg);
- assertEquals("Tom Fennelly", ActionUtils.currentFromMessage(oMsg));
+ assertEquals("Tom Fennelly", ActionUtils.getTaskObject(oMsg));
properties.clear();
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "name,age"));
processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.putCurrentObject(oMsg,new TestBean());
+ ActionUtils.setTaskObject(oMsg,new TestBean());
processor.process(oMsg);
- assertEquals("Tom Fennelly,21", ActionUtils.currentFromMessage(oMsg));
+ assertEquals("Tom Fennelly,21", ActionUtils.getTaskObject(oMsg));
properties.clear();
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "id,name,phone,age"));
processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.putCurrentObject(oMsg,new TestBean());
+ ActionUtils.setTaskObject(oMsg,new TestBean());
processor.process(oMsg);
- assertEquals(",Tom Fennelly,,21", ActionUtils.currentFromMessage(oMsg));
+ assertEquals(",Tom Fennelly,,21", ActionUtils.getTaskObject(oMsg));
properties.clear();
properties.add(new KeyValuePair(ObjectToCSVString.BEAN_PROPERTIES_PROP, "id"));
processor = new ObjectToCSVString("ObjectToCSVString", properties);
- ActionUtils.putCurrentObject(oMsg,new TestBean());
+ ActionUtils.setTaskObject(oMsg,new TestBean());
processor.process(oMsg);
- assertEquals("", ActionUtils.currentFromMessage(oMsg));
+ assertEquals("", ActionUtils.getTaskObject(oMsg));
}
public static class TestBean implements java.io.Serializable
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToFileWriterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToFileWriterUnitTest.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToFileWriterUnitTest.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -96,14 +96,14 @@
// Use the ObjectToFileWriter to write something to file...
ObjectToFileWriter fileWriter = new ObjectToFileWriter("ObjectToFileWriter-Test", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.putCurrentObject(oMsg,objectToWrite);
+ ActionUtils.setTaskObject(oMsg,objectToWrite);
fileWriter.process(oMsg);
// Use the FileToByteArray processor to read the file contents back...
oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.putCurrentObject(oMsg,file);
+ ActionUtils.setTaskObject(oMsg,file);
new FileToByteArray().process(oMsg);
- byte[] fileContent = (byte[])ActionUtils.currentFromMessage(oMsg);
+ byte[] fileContent = (byte[])ActionUtils.getTaskObject(oMsg);
// Make sure the contents are as expected...
String fileContentString = new String(fileContent);
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/ObjectToXStreamUnitTest.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -52,9 +52,9 @@
ObjectToXStream objectToXStream = new ObjectToXStream("TestBean-Serialiser", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.putCurrentObject(oMsg,new TestBean("Tom", "1234"));
+ ActionUtils.setTaskObject(oMsg,new TestBean("Tom", "1234"));
oMsg = objectToXStream.process(oMsg);
- String xml = (String)ActionUtils.currentFromMessage(oMsg);
+ String xml = (String)ActionUtils.getTaskObject(oMsg);
XStream xstream = new XStream(new DomDriver());
TestBean bean = new TestBean();
@@ -73,9 +73,9 @@
ObjectToXStream objectToXStream = new ObjectToXStream("TestBean-Serialiser", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.putCurrentObject(oMsg,new TestBean("Tom", "1234"));
+ ActionUtils.setTaskObject(oMsg,new TestBean("Tom", "1234"));
objectToXStream.process(oMsg);
- String xml = (String)ActionUtils.currentFromMessage(oMsg);
+ String xml = (String)ActionUtils.getTaskObject(oMsg);
XStream xstream = new XStream(new DomDriver());
TestBean bean = new TestBean();
@@ -94,9 +94,9 @@
ObjectToXStream objectToXStream = new ObjectToXStream("TestBean-Serialiser", properties);
Message oMsg = MessageFactory.getInstance().getMessage();
- ActionUtils.putCurrentObject(oMsg,new TestBean("Tom", "1234"));
+ ActionUtils.setTaskObject(oMsg,new TestBean("Tom", "1234"));
objectToXStream.process(oMsg);
- String xml = (String)ActionUtils.currentFromMessage(oMsg);
+ String xml = (String)ActionUtils.getTaskObject(oMsg);
XStream xstream = new XStream(new DomDriver());
xstream.alias("TomsClass", TestBean.class);
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/actions/converters/StringToLongConverter.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -38,13 +38,13 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#processAction(java.lang.Object)
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
if(!(oCurr instanceof String)) {
throw new ActionProcessingException("This action handler only accepts String object instances.");
}
System.out.println("StringToLongConverter");
- try { ActionUtils.putCurrentObject(message,new Long((String)oCurr)); }
+ try { ActionUtils.setTaskObject(message,new Long((String)oCurr)); }
catch (Exception e)
{ throw new ActionProcessingException(e); }
return message;
Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/AbstractListenerTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/AbstractListenerTest.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/AbstractListenerTest.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -99,7 +99,7 @@
// Set the actions on both the listener config and on the message as an attachment...
listenerConfig.setAttr(GpListener.PARM_ACTIONS, "ActionA, ActionB");
message.getAttachment().put(AbstractListener.MESSAGE_PROCESSING_ACTIONS_LIST, "ActionA, ActionC");
- ActionUtils.putCurrentObject(message, "message1");
+ ActionUtils.setTaskObject(message, "message1");
// Run the listener and check that it was the attachment actions config that was used...
runListener(message, null);
Modified: labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessBanksResponse.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -47,7 +47,7 @@
public Message process(Message message) throws ActionProcessingException {
BankQuoteResponse bankResponse;
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
try {
bankResponse = (BankQuoteResponse) oCurr;
} catch(ClassCastException e) {
Modified: labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditRequest.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditRequest.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditRequest.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -42,7 +42,7 @@
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
logger.info("processObject was called with <<" +oCurr.toString()+">>");
CreditCheckRequest creditRequest;
@@ -58,7 +58,7 @@
//create our Response
Object oResult = new CreditCheckResponseNotification(creditRequest.requestID, creditScore, creditRequest.customerID);
- ActionUtils.putCurrentObject(message,oResult);
+ ActionUtils.setTaskObject(message,oResult);
return message;
}
Modified: labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ProcessCreditResponse.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -49,7 +49,7 @@
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
logger.info("processObject was called with <<" + oCurr + ">>");
CreditCheckResponseNotification response;
@@ -77,7 +77,7 @@
// m_oLogger.info(this.getClass().getSimpleName() + " -- Customer2 TEST DEBUG customer2: \n" + customer2.toDTO().toXml());
QuoteRequest quote = CustomerAdapter.bankQuoteFromCustomer(customer);
- ActionUtils.putCurrentObject(message,quote);
+ ActionUtils.setTaskObject(message,quote);
return message;
} catch(Exception e) {
throw new ActionProcessingException("Failed to process credit check response.", e);
Modified: labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/product/samples/trailblazer/bankloanbrokerdemo/java/src/org/jboss/soa/esb/samples/loanbroker/actions/ToBankQuoteResponse.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -59,7 +59,7 @@
BankQuoteResponse bankResponse;
String message;
- Object oCurr = ActionUtils.currentFromMessage(messageIn);
+ Object oCurr = ActionUtils.getTaskObject(messageIn);
try {
message = (String)oCurr;
} catch(ClassCastException e) {
@@ -79,7 +79,7 @@
throw new ActionProcessingException("Unsupported Transformation: " + actionName);
}
- ActionUtils.putCurrentObject(messageIn,bankResponse);
+ ActionUtils.setTaskObject(messageIn,bankResponse);
return messageIn;
}
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/MessageBox.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/MessageBox.java 2006-10-10 13:02:27 UTC (rev 6719)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/listeners/MessageBox.java 2006-10-10 13:15:34 UTC (rev 6720)
@@ -48,7 +48,7 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#process(java.lang.Object)
*/
public Message process(Message message) throws ActionProcessingException {
- Object oCurr = ActionUtils.currentFromMessage(message);
+ Object oCurr = ActionUtils.getTaskObject(message);
if (null==oCurr)
oCurr="<null>";
logger.info("MessageBox received message: " + message);
@@ -78,14 +78,14 @@
* @see org.jboss.soa.esb.actions.ActionProcessor#getOkNotification(java.lang.Object)
*/
public Serializable getOkNotification(Message message) {
- return "OK" + ActionUtils.currentFromMessage(message);
+ return "OK" + ActionUtils.getTaskObject(message);
}
/* (non-Javadoc)
* @see org.jboss.soa.esb.actions.ActionProcessor#getErrorNotification(java.lang.Object)
*/
public Serializable getErrorNotification(Message message) {
- return "Error" + ActionUtils.currentFromMessage(message);
+ return "Error" + ActionUtils.getTaskObject(message);
}
}
More information about the jboss-svn-commits
mailing list